Rename classes related to top controls

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 970f8844240c0ba00699a1ccfdfaa6fa8b1f1563..1538bb260fc2f5e915741065d13778fa702de18a 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
@@ -24,50 +24,52 @@ public class WebappVisibilityTest extends NativeLibraryTestBase {
 
     @MediumTest
     @Feature({"Webapps"})
-    public void testShouldShowTopControls() {
-        // Show top controls for out-of-domain URLs.
-        assertTrue(shouldShowTopControls(
+    public void testShouldShowBrowserControls() {
+        // Show browser controls for out-of-domain URLs.
+        assertTrue(shouldShowBrowserControls(
                 WEBAPP_URL, "http://notoriginalwebsite.com", ConnectionSecurityLevel.NONE));
-        assertTrue(shouldShowTopControls(
+        assertTrue(shouldShowBrowserControls(
                 WEBAPP_URL, "http://otherwebsite.com", ConnectionSecurityLevel.NONE));
 
-        // Do not show top controls for subdomains and private registries that are secure.
-        assertFalse(shouldShowTopControls(
+        // Do not show browser controls for subdomains and private registries that are secure.
+        assertFalse(shouldShowBrowserControls(
                 WEBAPP_URL, "http://sub.originalwebsite.com", ConnectionSecurityLevel.NONE));
-        assertFalse(shouldShowTopControls(
+        assertFalse(shouldShowBrowserControls(
                 WEBAPP_URL, "http://thing.originalwebsite.com", ConnectionSecurityLevel.NONE));
-        assertFalse(shouldShowTopControls(WEBAPP_URL, WEBAPP_URL, ConnectionSecurityLevel.NONE));
-        assertFalse(shouldShowTopControls(
+        assertFalse(
+                shouldShowBrowserControls(WEBAPP_URL, WEBAPP_URL, ConnectionSecurityLevel.NONE));
+        assertFalse(shouldShowBrowserControls(
                 WEBAPP_URL, WEBAPP_URL + "/things.html", ConnectionSecurityLevel.NONE));
-        assertFalse(shouldShowTopControls(
+        assertFalse(shouldShowBrowserControls(
                 WEBAPP_URL, WEBAPP_URL + "/stuff.html", ConnectionSecurityLevel.NONE));
 
-        // Do not show top controls when URL is not available yet.
-        assertFalse(shouldShowTopControls(WEBAPP_URL, "", ConnectionSecurityLevel.NONE));
+        // Do not show browser controls when URL is not available yet.
+        assertFalse(shouldShowBrowserControls(WEBAPP_URL, "", ConnectionSecurityLevel.NONE));
 
-        // Show top controls for non secure URLs.
-        assertTrue(shouldShowTopControls(WEBAPP_URL, "http://sub.originalwebsite.com",
+        // Show browser controls for non secure URLs.
+        assertTrue(shouldShowBrowserControls(WEBAPP_URL, "http://sub.originalwebsite.com",
                 ConnectionSecurityLevel.SECURITY_WARNING));
-        assertTrue(shouldShowTopControls(
+        assertTrue(shouldShowBrowserControls(
                 WEBAPP_URL, "http://notoriginalwebsite.com", ConnectionSecurityLevel.DANGEROUS));
-        assertTrue(shouldShowTopControls(
+        assertTrue(shouldShowBrowserControls(
                 WEBAPP_URL, "http://otherwebsite.com", ConnectionSecurityLevel.DANGEROUS));
-        assertTrue(shouldShowTopControls(
+        assertTrue(shouldShowBrowserControls(
                 WEBAPP_URL, "http://thing.originalwebsite.com", ConnectionSecurityLevel.DANGEROUS));
-        assertTrue(shouldShowTopControls(
+        assertTrue(shouldShowBrowserControls(
                 WEBAPP_URL, WEBAPP_URL, ConnectionSecurityLevel.SECURITY_WARNING));
-        assertTrue(shouldShowTopControls(
+        assertTrue(shouldShowBrowserControls(
                 WEBAPP_URL, WEBAPP_URL + "/things.html", ConnectionSecurityLevel.SECURITY_WARNING));
-        assertTrue(shouldShowTopControls(
+        assertTrue(shouldShowBrowserControls(
                 WEBAPP_URL, WEBAPP_URL + "/stuff.html", ConnectionSecurityLevel.SECURITY_WARNING));
     }
 
     /**
-     * Convenience wrapper for WebappDelegateFactory.TopControlsDelegate#shouldShowTopControls()
+     * Convenience wrapper for
+     * WebappDelegateFactory.BrowserControlsDelegate#shouldShowBrowserControls()
      */
-    private static boolean shouldShowTopControls(
-                String webappStartUrl, String url, int securityLevel) {
-        return WebappDelegateFactory.TopControlsDelegate.shouldShowTopControls(
+    private static boolean shouldShowBrowserControls(
+            String webappStartUrl, String url, int securityLevel) {
+        return WebappDelegateFactory.BrowserControlsDelegate.shouldShowBrowserControls(
                 webappStartUrl, url, securityLevel);
     }
 }