Revert of Revert of Move SecurityLevel into a class of its own (patchset #1 id:1...
commitbc96efa37918ae7997ff69083263b8d2302b4dc8
authorsergeyv <sergeyv@chromium.org>
Thu, 14 May 2015 11:59:11 +0000 (14 04:59 -0700)
committerCommit bot <commit-bot@chromium.org>
Thu, 14 May 2015 11:59:30 +0000 (14 11:59 +0000)
treed24a322fc3f940803d60fe1e34701869f8d51541
parentc49162e3fa9557ce8a42fd1c5562e0d4ae825dc6
Revert of Revert of Move SecurityLevel into a class of its own (patchset #1 id:1 of https://codereview.chromium.org/1135373003/)

Reason for revert:
Reland initial patch. There is a fix for SecurityLevelTest:

https://codereview.chromium.org/1135073003

Original issue's description:
> Revert of Move SecurityLevel into a class of its own (patchset #19 id:420001 of https://codereview.chromium.org/1123943002/)
>
> Reason for revert:
> Android Tests dbg bot is failing:
> http://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20(dbg)
>
> Failure example: http://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20%28dbg%29/builds/27901
>
> Original issue's description:
> > Move SecurityLevel into a class of its own
> >
> > This CL moves |GetSecurityLevelForWebContents| and the |SecurityLevel|
> > enum into a class of their own: |ConnectionSecurityHelper| in
> > //chrome/browser/ssl (since it is applying Chrome-specific security
> > policy to determine the security level of a page).
> >
> > Later, we will use the new |ConnectionSecurityHelper| class to compute a
> > security level for a page to send to the DevTools Security
> > panel. Specifically, we need to be able to calculate the security level
> > for a given page, not just the WebContents for the active tab.
> >
> > BUG=484392
> >
> > Committed: https://crrev.com/ca7c0a3374c21ab10c821f4f3a890afc79182acf
> > Cr-Commit-Position: refs/heads/master@{#329591}
> >
> > Committed: https://crrev.com/f50c9b4834e151aa6b5538545a503614cb74f5f9
> > Cr-Commit-Position: refs/heads/master@{#329724}
>
> TBR=felt@chromium.org,pkasting@chromium.org,rsleevi@chromium.org,bauerb@chromium.org,sky@chromium.org,tedchoc@chromium.org,estark@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=484392
>
> Committed: https://crrev.com/39722bb693112be3d91c729246c0ade351e7e900
> Cr-Commit-Position: refs/heads/master@{#329827}

TBR=felt@chromium.org,pkasting@chromium.org,rsleevi@chromium.org,bauerb@chromium.org,sky@chromium.org,tedchoc@chromium.org,estark@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=484392

Review URL: https://codereview.chromium.org/1124383007

Cr-Commit-Position: refs/heads/master@{#329832}
27 files changed:
chrome/android/BUILD.gn
chrome/android/java/src/org/chromium/chrome/browser/Tab.java
chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java
chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java
chrome/android/java/src/org/chromium/chrome/browser/ssl/ConnectionSecurityHelper.java [new file with mode: 0644]
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java
chrome/android/javatests_shell/src/org/chromium/chrome/browser/TabTest.java
chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
chrome/browser/android/chrome_jni_registrar.cc
chrome/browser/ssl/connection_security_helper.cc [new file with mode: 0644]
chrome/browser/ssl/connection_security_helper.h [new file with mode: 0644]
chrome/browser/ssl/connection_security_helper_android.cc [new file with mode: 0644]
chrome/browser/ssl/connection_security_helper_android.h [new file with mode: 0644]
chrome/browser/ui/android/toolbar/toolbar_model_android.cc
chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
chrome/browser/ui/toolbar/test_toolbar_model.cc
chrome/browser/ui/toolbar/test_toolbar_model.h
chrome/browser/ui/toolbar/toolbar_model.h
chrome/browser/ui/toolbar/toolbar_model_impl.cc
chrome/browser/ui/toolbar/toolbar_model_impl.h
chrome/browser/ui/views/location_bar/location_bar_view.cc
chrome/browser/ui/views/location_bar/location_bar_view.h
chrome/browser/ui/views/omnibox/omnibox_view_views.cc
chrome/browser/ui/views/omnibox/omnibox_view_views.h
chrome/chrome.gyp
chrome/chrome_browser.gypi