Rename classes related to top controls

chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
index b1bafafddc97e1a2999df62c3d5430a6dbe55f7a..2dae93a1ab13bf6b8a9555149a68f664ee491b57 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -82,9 +82,9 @@ import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoScreen;
 import org.chromium.chrome.browser.signin.SigninPromoUtil;
 import org.chromium.chrome.browser.snackbar.undo.UndoBarController;
+import org.chromium.chrome.browser.tab.BrowserControlsVisibilityDelegate;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabDelegateFactory;
-import org.chromium.chrome.browser.tab.TopControlsVisibilityDelegate;
 import org.chromium.chrome.browser.tabmodel.ChromeTabCreator;
 import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabModel;
@@ -240,28 +240,29 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
         }
     }
 
-    private class TabbedModeTopControlsVisibilityDelegate extends TopControlsVisibilityDelegate {
-        public TabbedModeTopControlsVisibilityDelegate(Tab tab) {
+    private class TabbedModeBrowserControlsVisibilityDelegate
+            extends BrowserControlsVisibilityDelegate {
+        public TabbedModeBrowserControlsVisibilityDelegate(Tab tab) {
             super(tab);
         }
 
         @Override
-        public boolean isShowingTopControlsEnabled() {
+        public boolean isShowingBrowserControlsEnabled() {
             if (mVrShellDelegate.isInVR()) return false;
-            return super.isShowingTopControlsEnabled();
+            return super.isShowingBrowserControlsEnabled();
         }
 
         @Override
-        public boolean isHidingTopControlsEnabled() {
+        public boolean isHidingBrowserControlsEnabled() {
             if (mVrShellDelegate.isInVR()) return true;
-            return super.isHidingTopControlsEnabled();
+            return super.isHidingBrowserControlsEnabled();
         }
     }
 
     private class TabbedModeTabDelegateFactory extends TabDelegateFactory {
         @Override
-        public TopControlsVisibilityDelegate createTopControlsVisibilityDelegate(Tab tab) {
-            return new TabbedModeTopControlsVisibilityDelegate(tab);
+        public BrowserControlsVisibilityDelegate createBrowserControlsVisibilityDelegate(Tab tab) {
+            return new TabbedModeBrowserControlsVisibilityDelegate(tab);
         }
     }