Use only renderer driven offsets for fullscreen state.

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
index 092fc26cfc0e0c01422f75300816b0d2d5095612..9d654e5b348f3b882961913df33c5dcc250d7d76 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
@@ -50,6 +50,7 @@ import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.Invalidator;
 import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
+import org.chromium.chrome.browser.fullscreen.BrowserStateBrowserControlsVisibilityDelegate;
 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.omnibox.LocationBar;
@@ -237,7 +238,7 @@ public class ToolbarPhone extends ToolbarLayout
     private boolean mHasCheckedIfTabSwitcherCalloutIsNecessary;
 
     /** Manages when the Toolbar hides and unhides. */
-    private FullscreenManager mFullscreenManager;
+    private BrowserStateBrowserControlsVisibilityDelegate mControlsVisibilityDelegate;
 
     /** Token held when the TabSwitcherCallout is displayed to prevent the Toolbar from hiding. */
     private int mFullscreenCalloutToken = FullscreenManager.INVALID_TOKEN;
@@ -2201,9 +2202,10 @@ public class ToolbarPhone extends ToolbarLayout
     }
 
     @Override
-    public void setFullscreenManager(FullscreenManager manager) {
-        super.setFullscreenManager(manager);
-        mFullscreenManager = manager;
+    public void setBrowserControlsVisibilityDelegate(
+            BrowserStateBrowserControlsVisibilityDelegate controlsVisibilityDelegate) {
+        super.setBrowserControlsVisibilityDelegate(controlsVisibilityDelegate);
+        mControlsVisibilityDelegate = controlsVisibilityDelegate;
     }
 
     private void setUseLightDrawablesForTextureCapture() {
@@ -2227,17 +2229,17 @@ public class ToolbarPhone extends ToolbarLayout
         mTabSwitcherCallout.setOnDismissListener(new OnDismissListener() {
             @Override
             public void onDismiss() {
-                if (mFullscreenManager != null) {
-                    mFullscreenManager.hideControlsPersistent(mFullscreenCalloutToken);
+                if (mControlsVisibilityDelegate != null) {
+                    mControlsVisibilityDelegate.hideControlsPersistent(mFullscreenCalloutToken);
                     mFullscreenCalloutToken = FullscreenManager.INVALID_TOKEN;
                 }
                 mTabSwitcherCallout = null;
             }
         });
 
-        if (mFullscreenManager != null) {
+        if (mControlsVisibilityDelegate != null) {
             mFullscreenCalloutToken =
-                    mFullscreenManager.showControlsPersistentAndClearOldToken(
+                    mControlsVisibilityDelegate.showControlsPersistentAndClearOldToken(
                             mFullscreenCalloutToken);
         }
     }