Revert of chrome/android: Push EventFilters into the Layout implementations.

chrome/android/java/src/org/chromium/chrome/browser/widget/OverviewListLayout.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.widget;
 
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ListView;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.layouts.Layout;
 import org.chromium.chrome.browser.compositor.layouts.LayoutRenderHost;
 import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
-import org.chromium.chrome.browser.compositor.layouts.eventfilter.BlackHoleEventFilter;
 import org.chromium.chrome.browser.compositor.layouts.eventfilter.EventFilter;
 import org.chromium.chrome.browser.compositor.scene_layer.SceneLayer;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelUtils;
 import org.chromium.chrome.browser.widget.accessibility.AccessibilityTabModelAdapter.AccessibilityTabModelAdapterListener;
 import org.chromium.chrome.browser.widget.accessibility.AccessibilityTabModelWrapper;
 
 /**
  * A {@link Layout} that shows the tabs as two {@link ListView}s, one for each {@link TabModel} to
  * represent.
  */
 public class OverviewListLayout extends Layout implements AccessibilityTabModelAdapterListener {
     private AccessibilityTabModelWrapper mTabModelWrapper;
     private final float mDpToPx;
-    private final BlackHoleEventFilter mBlackHoleEventFilter;
     private final SceneLayer mSceneLayer;
 
-    public OverviewListLayout(
-            Context context, LayoutUpdateHost updateHost, LayoutRenderHost renderHost) {
-        super(context, updateHost, renderHost);
-        mBlackHoleEventFilter = new BlackHoleEventFilter(context);
+    public OverviewListLayout(Context context, LayoutUpdateHost updateHost,
+            LayoutRenderHost renderHost, EventFilter eventFilter) {
+        super(context, updateHost, renderHost, eventFilter);
         mDpToPx = context.getResources().getDisplayMetrics().density;
         mSceneLayer = new SceneLayer();
     }
 
     @Override
     public void attachViews(ViewGroup container) {
         if (mTabModelWrapper == null) {
             mTabModelWrapper =
                     (AccessibilityTabModelWrapper) LayoutInflater.from(container.getContext())
                             .inflate(R.layout.accessibility_tab_switcher, null);
@@ skipping 130 matching lines @@
     public void onTabClosureCommitted(long time, int tabId, boolean incognito) {
         mTabModelWrapper.setStateBasedOnModel();
     }
 
     @Override
     public void showTab(int tabId) {
         onTabSelecting(0, tabId);
     }
 
     @Override
-    protected EventFilter getEventFilter() {
-        return mBlackHoleEventFilter;
-    }
-
-    @Override
     protected SceneLayer getSceneLayer() {
         return mSceneLayer;
     }
 }