Make ConnectionSecurityHelper a namespace instead of a class

chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java

Index: chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java
index cfbffe0afc1d7ac12f95ca24f4e9d3b79d071ef6..2d1f981aa6f341137e81a42b355980dac22d57e6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java
@@ -12,7 +12,7 @@ import android.text.style.StrikethroughSpan;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.ssl.ConnectionSecurityHelperSecurityLevel;
+import org.chromium.chrome.browser.ssl.ConnectionSecurityStatusSecurityLevel;
 
 import java.util.Locale;
 
@@ -135,7 +135,7 @@ public class OmniboxUrlEmphasizer {
      *            modified.
      * @param resources Resources for the given application context.
      * @param profile The profile viewing the given URL.
-     * @param securityLevel A valid ConnectionSecurityHelperSecurityLevel for the specified
+     * @param securityLevel A valid ConnectionSecurityStatusSecurityLevel for the specified
      *                      web contents.
      * @param isInternalPage Whether this page is an internal Chrome page.
      * @param useDarkColors Whether the text colors should be dark (i.e.
@@ -145,9 +145,10 @@ public class OmniboxUrlEmphasizer {
     public static void emphasizeUrl(Spannable url, Resources resources, Profile profile,
             int securityLevel, boolean isInternalPage,
             boolean useDarkColors, boolean emphasizeHttpsScheme) {
-        assert (securityLevel == ConnectionSecurityHelperSecurityLevel.SECURITY_ERROR
-                || securityLevel == ConnectionSecurityHelperSecurityLevel.SECURITY_WARNING)
-                ? emphasizeHttpsScheme : true;
+        assert (securityLevel == ConnectionSecurityStatusSecurityLevel.SECURITY_ERROR
+                || securityLevel == ConnectionSecurityStatusSecurityLevel.SECURITY_WARNING)
+                ? emphasizeHttpsScheme
+                : true;
 
         String urlString = url.toString();
 
@@ -171,22 +172,22 @@ public class OmniboxUrlEmphasizer {
             int colorId = nonEmphasizedColorId;
             if (!isInternalPage && emphasizeHttpsScheme) {
                 switch (securityLevel) {
-                    case ConnectionSecurityHelperSecurityLevel.NONE:
+                    case ConnectionSecurityStatusSecurityLevel.NONE:
                         colorId = nonEmphasizedColorId;
                         break;
-                    case ConnectionSecurityHelperSecurityLevel.SECURITY_WARNING:
+                    case ConnectionSecurityStatusSecurityLevel.SECURITY_WARNING:
                         colorId = R.color.url_emphasis_start_scheme_security_warning;
                         break;
-                    case ConnectionSecurityHelperSecurityLevel.SECURITY_ERROR:
+                    case ConnectionSecurityStatusSecurityLevel.SECURITY_ERROR:
                         colorId = R.color.url_emphasis_start_scheme_security_error;
                         UrlEmphasisSecurityErrorSpan ss = new UrlEmphasisSecurityErrorSpan();
                         url.setSpan(ss, startSchemeIndex, endSchemeIndex,
                                 Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                         break;
-                    case ConnectionSecurityHelperSecurityLevel.EV_SECURE:
+                    case ConnectionSecurityStatusSecurityLevel.EV_SECURE:
                         colorId = R.color.url_emphasis_start_scheme_ev_secure;
                         break;
-                    case ConnectionSecurityHelperSecurityLevel.SECURE:
+                    case ConnectionSecurityStatusSecurityLevel.SECURE:
                         colorId = R.color.url_emphasis_start_scheme_secure;
                         break;
                     default: