Revert of Move SecurityLevel into a class of its own

chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java

Index: chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
diff --git a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java b/chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
index 0173353c8542f62dacdaf9dc27a95e4ecd0442ef..6ce272fb76915bf96e9943686fef8bc5e7926f73 100644
--- a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
+++ b/chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
@@ -17,7 +17,7 @@
 import org.chromium.chrome.browser.omnibox.OmniboxUrlEmphasizer.UrlEmphasisSecurityErrorSpan;
 import org.chromium.chrome.browser.omnibox.OmniboxUrlEmphasizer.UrlEmphasisSpan;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.ssl.ConnectionSecurityHelperSecurityLevel;
+import org.chromium.chrome.browser.ui.toolbar.ToolbarModelSecurityLevel;
 import org.chromium.chrome.shell.ChromeShellActivity;
 import org.chromium.chrome.shell.ChromeShellTab;
 import org.chromium.chrome.shell.ChromeShellTestBase;
@@ -125,8 +125,9 @@
     @Feature({"Browser", "Main"})
     public void testShortSecureHTTPSUrl() {
         Spannable url = new SpannableStringBuilder("https://www.google.com/");
-        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
-                ConnectionSecurityHelperSecurityLevel.SECURE, false, true);
+        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
+                mProfile, ToolbarModelSecurityLevel.SECURE, false,
+                true);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 4, spans.length);
@@ -149,8 +150,9 @@
     @Feature({"Browser", "Main"})
     public void testShortSecureHTTPSUrlWithLightColors() {
         Spannable url = new SpannableStringBuilder("https://www.google.com/");
-        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
-                ConnectionSecurityHelperSecurityLevel.SECURE, false, false);
+        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
+                mProfile, ToolbarModelSecurityLevel.SECURE, false,
+                false);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 4, spans.length);
@@ -174,8 +176,9 @@
     public void testLongInsecureHTTPSUrl() {
         Spannable url = new SpannableStringBuilder(
                 "https://www.google.com/q?query=abc123&results=1");
-        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
-                ConnectionSecurityHelperSecurityLevel.SECURITY_ERROR, false, true);
+        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
+                mProfile, ToolbarModelSecurityLevel.SECURITY_ERROR, false,
+                true);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 5, spans.length);
@@ -199,8 +202,9 @@
     @Feature({"Browser", "Main"})
     public void testVeryShortWarningHTTPSUrl() {
         Spannable url = new SpannableStringBuilder("https://www.dodgysite.com");
-        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
-                ConnectionSecurityHelperSecurityLevel.SECURITY_WARNING, false, true);
+        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
+                mProfile, ToolbarModelSecurityLevel.SECURITY_WARNING, false,
+                true);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 3, spans.length);
@@ -221,8 +225,9 @@
     @Feature({"Browser", "Main"})
     public void testAboutPageUrl() {
         Spannable url = new SpannableStringBuilder("about:blank");
-        OmniboxUrlEmphasizer.emphasizeUrl(
-                url, mResources, mProfile, ConnectionSecurityHelperSecurityLevel.NONE, true, true);
+        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
+                mProfile, ToolbarModelSecurityLevel.NONE, true,
+                true);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 3, spans.length);
@@ -244,8 +249,9 @@
     public void testDataUrl() {
         Spannable url = new SpannableStringBuilder(
                 "data:text/plain;charset=utf-8;base64,VGVzdCBVUkw=");
-        OmniboxUrlEmphasizer.emphasizeUrl(
-                url, mResources, mProfile, ConnectionSecurityHelperSecurityLevel.NONE, true, true);
+        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
+                mProfile, ToolbarModelSecurityLevel.NONE, true,
+                true);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 1, spans.length);
@@ -262,8 +268,9 @@
     @Feature({"Browser", "Main"})
     public void testInternalChromePageUrl() {
         Spannable url = new SpannableStringBuilder("chrome://bookmarks");
-        OmniboxUrlEmphasizer.emphasizeUrl(
-                url, mResources, mProfile, ConnectionSecurityHelperSecurityLevel.NONE, true, true);
+        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
+                mProfile, ToolbarModelSecurityLevel.NONE, true,
+                true);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 3, spans.length);
@@ -284,8 +291,9 @@
     @Feature({"Browser", "Main"})
     public void testInternalChromeNativePageUrl() {
         Spannable url = new SpannableStringBuilder("chrome-native://bookmarks");
-        OmniboxUrlEmphasizer.emphasizeUrl(
-                url, mResources, mProfile, ConnectionSecurityHelperSecurityLevel.NONE, true, true);
+        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
+                mProfile, ToolbarModelSecurityLevel.NONE, true,
+                true);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 3, spans.length);
@@ -306,8 +314,9 @@
     @Feature({"Browser", "Main"})
     public void testInvalidUrl() {
         Spannable url = new SpannableStringBuilder("invalidurl");
-        OmniboxUrlEmphasizer.emphasizeUrl(
-                url, mResources, mProfile, ConnectionSecurityHelperSecurityLevel.NONE, true, true);
+        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
+                mProfile, ToolbarModelSecurityLevel.NONE, true,
+                true);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 1, spans.length);