ControlContainer is now a child of CompositorViewHolder

chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
index ceba9f8abe669383fe94b3db90c2c9b3a9e59395..0404d9a620da2fdfa48cc9ac8d1d866f9b3364b2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
@@ -99,7 +99,6 @@ public class CompositorViewHolder extends FrameLayout
     private ChromeFullscreenManager mFullscreenManager;
     private View mAccessibilityView;
     private CompositorAccessibilityProvider mNodeProvider;
-    private boolean mFullscreenTouchEvent;
     private float mLastContentOffset;
     private float mLastVisibleContentOffset;
 
@@ -352,14 +351,6 @@ public class CompositorViewHolder extends FrameLayout
 
         if (mLayoutManager == null) return false;
 
-        mFullscreenTouchEvent = false;
-        if (mFullscreenManager != null && mFullscreenManager.onInterceptMotionEvent(e)
-                && !mEnableCompositorTabStrip) {
-            // Don't eat the event if the new tab strip is enabled.
-            mFullscreenTouchEvent = true;
-            return true;
-        }
-
         setContentViewMotionEventOffsets(e, false);
         return mLayoutManager.onInterceptTouchEvent(e, mIsKeyboardShowing);
     }
@@ -369,7 +360,6 @@ public class CompositorViewHolder extends FrameLayout
         super.onTouchEvent(e);
 
         if (mFullscreenManager != null) mFullscreenManager.onMotionEvent(e);
-        if (mFullscreenTouchEvent) return true;
         boolean consumed = mLayoutManager != null && mLayoutManager.onTouchEvent(e);
         setContentViewMotionEventOffsets(e, true);
         return consumed;