ControlContainer is now a child of CompositorViewHolder

chrome/android/java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java
index 56a69288f8feb6c1a2b2c5f7a981ff1db139b231..518d9d4410181239380279dcb9dfe07ed6a5edb0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java
@@ -27,7 +27,6 @@ import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabModelObserver;
-import org.chromium.chrome.browser.util.ViewUtils;
 import org.chromium.chrome.browser.widget.ControlContainer;
 import org.chromium.content.browser.ContentVideoView;
 import org.chromium.content.browser.ContentViewCore;
@@ -596,33 +595,6 @@ public class ChromeFullscreenManager
     }
 
     /**
-     * @param e The dispatched motion event
-     * @return Whether or not this motion event is in the top control container area and should be
-     *         consumed.
-     */
-    public boolean onInterceptMotionEvent(MotionEvent e) {
-        int bottomPosition;
-        int topPosition = 0;
-        float offset;
-
-        if (mIsBottomControls) {
-            int[] position = new int[2];
-            ViewUtils.getRelativeLayoutPosition(mControlContainer.getView().getRootView(),
-                    mControlContainer.getView(), position);
-
-            topPosition = position[1];
-            bottomPosition = topPosition + getBottomControlsHeight();
-            offset = getBottomControlOffset();
-        } else {
-            bottomPosition = getTopControlsHeight();
-            offset = getTopControlOffset();
-        }
-
-        return e.getY() < topPosition + offset && e.getY() > bottomPosition + offset
-                && !mBrowserControlsAndroidViewHidden;
-    }
-
-    /**
      * Notifies the fullscreen manager that a motion event has occurred.
      * @param e The dispatched motion event.
      */