Rename classes related to top controls

chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManager.java
index 6f8b0b3c529b31a800c5c886b6a6b131249a2af4..09c01f82075c0c41f1c05997bbd9e455943eb457 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManager.java
@@ -88,7 +88,7 @@ public abstract class LayoutManager implements LayoutUpdateHost, LayoutProvider,
 
     protected float mLastContentWidthDp;
     protected float mLastContentHeightDp;
-    protected float mLastHeightMinusTopControlsDp;
+    protected float mLastHeightMinusBrowserControlsDp;
 
     private final RectF mCachedRectF = new RectF();
     private final Rect mCachedRect = new Rect();
@@ -115,7 +115,7 @@ public abstract class LayoutManager implements LayoutUpdateHost, LayoutProvider,
         mLastVisibleViewportDp.set(0, 0, mLastContentWidthDp, mLastContentHeightDp);
         mLastFullscreenViewportDp.set(0, 0, mLastContentWidthDp, mLastContentHeightDp);
 
-        mLastHeightMinusTopControlsDp = mLastContentHeightDp;
+        mLastHeightMinusBrowserControlsDp = mLastContentHeightDp;
     }
 
     /**
@@ -288,20 +288,20 @@ public abstract class LayoutManager implements LayoutUpdateHost, LayoutProvider,
     protected void onViewportChanged(RectF viewportDp) {
         if (getActiveLayout() != null) {
             getActiveLayout().sizeChanged(mLastVisibleViewportDp, mLastFullscreenViewportDp,
-                    mLastHeightMinusTopControlsDp, getOrientation());
+                    mLastHeightMinusBrowserControlsDp, getOrientation());
         }
     }
 
     /**
      * Should be called from an external source when the viewport changes.  {@code viewport} and
-     * {@code visibleViewport} are different, as the top controls might be covering part of the
+     * {@code visibleViewport} are different, as the browser controls might be covering part of the
      * viewport but a {@link Layout} might want to consume the whole space (or not).
      * @param viewport               The new viewport in px.
      * @param visibleViewport        The new visible viewport in px.
-     * @param heightMinusTopControls The height of the viewport minus the top controls.
+     * @param heightMinusBrowserControls The height of the viewport minus the browser controls.
      */
     public final void pushNewViewport(
-            Rect viewport, Rect visibleViewport, int heightMinusTopControls) {
+            Rect viewport, Rect visibleViewport, int heightMinusBrowserControls) {
         mLastViewportPx.set(viewport);
         mLastVisibleViewportPx.set(visibleViewport);
 
@@ -310,7 +310,7 @@ public abstract class LayoutManager implements LayoutUpdateHost, LayoutProvider,
         mLastVisibleViewportDp.set(visibleViewport.left * mPxToDp, visibleViewport.top * mPxToDp,
                 visibleViewport.right * mPxToDp, visibleViewport.bottom * mPxToDp);
         mLastFullscreenViewportDp.set(0, 0, viewport.right * mPxToDp, viewport.bottom * mPxToDp);
-        mLastHeightMinusTopControlsDp = heightMinusTopControls * mPxToDp;
+        mLastHeightMinusBrowserControlsDp = heightMinusBrowserControls * mPxToDp;
 
         propagateViewportToActiveLayout();
     }
@@ -465,7 +465,7 @@ public abstract class LayoutManager implements LayoutUpdateHost, LayoutProvider,
             }
 
             // Hide the toolbar immediately if the layout wants it gone quickly.
-            fullscreenManager.setTopControlsPermamentlyHidden(
+            fullscreenManager.setBrowserControlsPermamentlyHidden(
                     flags == SizingFlags.HELPER_HIDE_TOOLBAR_IMMEDIATE);
         }