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 fd3ce1dc0b963abbc9b80887bb37dbca6da1e37c..3e009b3df36c765b60fd9f578c976766ebef2422 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
@@ -100,7 +100,6 @@ public class CompositorViewHolder extends CoordinatorLayout
     private ChromeFullscreenManager mFullscreenManager;
     private View mAccessibilityView;
     private CompositorAccessibilityProvider mNodeProvider;
-    private boolean mFullscreenTouchEvent = false;
     private float mLastContentOffset = 0;
     private float mLastVisibleContentOffset = 0;
 
@@ -334,14 +333,6 @@ public class CompositorViewHolder extends CoordinatorLayout
 
         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);
     }
@@ -352,7 +343,6 @@ public class CompositorViewHolder extends CoordinatorLayout
         if (consumedBySuper) return true;
 
         if (mFullscreenManager != null) mFullscreenManager.onMotionEvent(e);
-        if (mFullscreenTouchEvent) return true;
         boolean consumed = mLayoutManager != null && mLayoutManager.onTouchEvent(e);
         setContentViewMotionEventOffsets(e, true);
         return consumed;