Rename classes related to top controls

chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

Index: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
index c52ea716777c5422ecf5eec6d0945dee8fb24e95..c152032614193c46781b4c83f8c677fbec960b38 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
@@ -99,9 +99,9 @@ import org.chromium.content.browser.crypto.CipherFactory;
 import org.chromium.content_public.browser.GestureStateListener;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.WebContents;
+import org.chromium.content_public.common.BrowserControlsState;
 import org.chromium.content_public.common.Referrer;
 import org.chromium.content_public.common.ResourceRequestBody;
-import org.chromium.content_public.common.TopControlsState;
 import org.chromium.printing.PrintManagerDelegateImpl;
 import org.chromium.printing.PrintingController;
 import org.chromium.printing.PrintingControllerImpl;
@@ -2684,7 +2684,7 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
     public void updateFullscreenEnabledState() {
         if (isFrozen()) return;
 
-        updateTopControlsState(getTopControlsStateConstraints(), TopControlsState.BOTH, true);
+        updateTopControlsState(getTopControlsStateConstraints(), BrowserControlsState.BOTH, true);
 
         if (getContentViewCore() != null && mFullscreenManager != null) {
             getContentViewCore().updateMultiTouchZoomSupport(
@@ -2723,8 +2723,9 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
         int constraints = getTopControlsStateConstraints();
         // Do nothing if current and constraints conflict to avoid error in
         // renderer.
-        if ((constraints == TopControlsState.HIDDEN && current == TopControlsState.SHOWN)
-                || (constraints == TopControlsState.SHOWN && current == TopControlsState.HIDDEN)) {
+        if ((constraints == BrowserControlsState.HIDDEN && current == BrowserControlsState.SHOWN)
+                || (constraints == BrowserControlsState.SHOWN
+                        && current == BrowserControlsState.HIDDEN)) {
             return;
         }
         updateTopControlsState(getTopControlsStateConstraints(), current, animate);
@@ -2762,11 +2763,11 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
         boolean enableHidingTopControls = isHidingTopControlsEnabled();
         boolean enableShowingTopControls = isShowingTopControlsEnabled();
 
-        int constraints = TopControlsState.BOTH;
+        int constraints = BrowserControlsState.BOTH;
         if (!enableShowingTopControls) {
-            constraints = TopControlsState.HIDDEN;
+            constraints = BrowserControlsState.HIDDEN;
         } else if (!enableHidingTopControls) {
-            constraints = TopControlsState.SHOWN;
+            constraints = BrowserControlsState.SHOWN;
         }
         return constraints;
     }