Rename classes related to top controls

chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java
index a961df781873e31c3b5b77d898688d3a28a161d6..ba37b6cd3df501cf98e7abd2095b98b392dbb5b1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java
@@ -672,7 +672,7 @@ public class StackLayout extends Layout implements Animatable<StackLayout.Proper
         protected float mWidth, mHeight;
         PortraitViewport() {
             mWidth = StackLayout.this.getWidth();
-            mHeight = StackLayout.this.getHeightMinusTopControls();
+            mHeight = StackLayout.this.getHeightMinusBrowserControls();
         }
 
         float getClampedRenderedScrollOffset() {
@@ -728,7 +728,7 @@ public class StackLayout extends Layout implements Animatable<StackLayout.Proper
         }
 
         float getTopHeightOffset() {
-            return (StackLayout.this.getHeight() - getHeightMinusTopControls())
+            return (StackLayout.this.getHeight() - getHeightMinusBrowserControls())
                     * mStackOffsetYPercent;
         }
     }
@@ -736,7 +736,7 @@ public class StackLayout extends Layout implements Animatable<StackLayout.Proper
     class LandscapeViewport extends PortraitViewport {
         LandscapeViewport() {
             // This is purposefully inverted.
-            mWidth = StackLayout.this.getHeightMinusTopControls();
+            mWidth = StackLayout.this.getHeightMinusBrowserControls();
             mHeight = StackLayout.this.getWidth();
         }
 
@@ -1041,8 +1041,8 @@ public class StackLayout extends Layout implements Animatable<StackLayout.Proper
     }
 
     private float getFullScrollDistance() {
-        float distance =
-                getOrientation() == Orientation.PORTRAIT ? getWidth() : getHeightMinusTopControls();
+        float distance = getOrientation() == Orientation.PORTRAIT ? getWidth()
+                                                                  : getHeightMinusBrowserControls();
         return distance - 2 * getViewportParameters().getInnerMargin();
     }