Make ConnectionSecurityHelper a namespace instead of a class

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappVisibilityTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappVisibilityTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappVisibilityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappVisibilityTest.java
index 07aa8c392295fcfee157c5f18ca551e15c47b0d1..e3d68421edd77dcba96fc4cd9069055309db25e0 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappVisibilityTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappVisibilityTest.java
@@ -7,7 +7,7 @@ package org.chromium.chrome.browser.webapps;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.test.util.Feature;
-import org.chromium.chrome.browser.ssl.ConnectionSecurityHelperSecurityLevel;
+import org.chromium.chrome.browser.ssl.ConnectionSecurityStatusSecurityLevel;
 import org.chromium.content_public.common.ScreenOrientationValues;
 
 /**
@@ -24,46 +24,40 @@ public class WebappVisibilityTest extends WebappActivityTestBase {
 
         // Show top controls for out-of-domain URLs.
         assertTrue(getActivity().shouldShowTopControls(
-                "http://notoriginalwebsite.com", ConnectionSecurityHelperSecurityLevel.NONE));
+                "http://notoriginalwebsite.com", ConnectionSecurityStatusSecurityLevel.NONE));
         assertTrue(getActivity().shouldShowTopControls(
-                "http://otherwebsite.com", ConnectionSecurityHelperSecurityLevel.NONE));
+                "http://otherwebsite.com", ConnectionSecurityStatusSecurityLevel.NONE));
 
         // Do not show top controls for subdomains and private registries that are secure.
         assertFalse(getActivity().shouldShowTopControls(
-                "http://sub.originalwebsite.com", ConnectionSecurityHelperSecurityLevel.NONE));
+                "http://sub.originalwebsite.com", ConnectionSecurityStatusSecurityLevel.NONE));
         assertFalse(getActivity().shouldShowTopControls(
-                "http://thing.originalwebsite.com", ConnectionSecurityHelperSecurityLevel.NONE));
-        assertFalse(getActivity().shouldShowTopControls(webappUrl,
-                ConnectionSecurityHelperSecurityLevel.NONE));
+                "http://thing.originalwebsite.com", ConnectionSecurityStatusSecurityLevel.NONE));
         assertFalse(getActivity().shouldShowTopControls(
-                webappUrl + "/things.html", ConnectionSecurityHelperSecurityLevel.NONE));
+                webappUrl, ConnectionSecurityStatusSecurityLevel.NONE));
         assertFalse(getActivity().shouldShowTopControls(
-                webappUrl + "/stuff.html", ConnectionSecurityHelperSecurityLevel.NONE));
+                webappUrl + "/things.html", ConnectionSecurityStatusSecurityLevel.NONE));
+        assertFalse(getActivity().shouldShowTopControls(
+                webappUrl + "/stuff.html", ConnectionSecurityStatusSecurityLevel.NONE));
 
         // Do not show top controls when URL is not available yet.
-        assertFalse(getActivity().shouldShowTopControls("",
-                ConnectionSecurityHelperSecurityLevel.NONE));
+        assertFalse(getActivity().shouldShowTopControls(
+                "", ConnectionSecurityStatusSecurityLevel.NONE));
 
         // Show top controls for non secure URLs.
+        assertTrue(getActivity().shouldShowTopControls("http://sub.originalwebsite.com",
+                ConnectionSecurityStatusSecurityLevel.SECURITY_WARNING));
+        assertTrue(getActivity().shouldShowTopControls("http://notoriginalwebsite.com",
+                ConnectionSecurityStatusSecurityLevel.SECURITY_ERROR));
         assertTrue(getActivity().shouldShowTopControls(
-                "http://sub.originalwebsite.com",
-                ConnectionSecurityHelperSecurityLevel.SECURITY_WARNING));
-        assertTrue(getActivity().shouldShowTopControls(
-                "http://notoriginalwebsite.com",
-                ConnectionSecurityHelperSecurityLevel.SECURITY_ERROR));
-        assertTrue(getActivity().shouldShowTopControls(
-                "http://otherwebsite.com",
-                ConnectionSecurityHelperSecurityLevel.SECURITY_ERROR));
-        assertTrue(getActivity().shouldShowTopControls(
-                "http://thing.originalwebsite.com",
-                ConnectionSecurityHelperSecurityLevel.SECURITY_ERROR));
-        assertTrue(getActivity().shouldShowTopControls(
-                webappUrl, ConnectionSecurityHelperSecurityLevel.SECURITY_WARNING));
+                "http://otherwebsite.com", ConnectionSecurityStatusSecurityLevel.SECURITY_ERROR));
+        assertTrue(getActivity().shouldShowTopControls("http://thing.originalwebsite.com",
+                ConnectionSecurityStatusSecurityLevel.SECURITY_ERROR));
         assertTrue(getActivity().shouldShowTopControls(
-                webappUrl + "/things.html",
-                ConnectionSecurityHelperSecurityLevel.SECURITY_WARNING));
+                webappUrl, ConnectionSecurityStatusSecurityLevel.SECURITY_WARNING));
+        assertTrue(getActivity().shouldShowTopControls(webappUrl + "/things.html",
+                ConnectionSecurityStatusSecurityLevel.SECURITY_WARNING));
         assertTrue(getActivity().shouldShowTopControls(
-                webappUrl + "/stuff.html",
-                ConnectionSecurityHelperSecurityLevel.SECURITY_WARNING));
+                webappUrl + "/stuff.html", ConnectionSecurityStatusSecurityLevel.SECURITY_WARNING));
     }
 }