Remove GestureEventFilter and clean up related bits assuming that we turn on

content/browser/renderer_host/render_widget_host_unittest.cc

Index: content/browser/renderer_host/render_widget_host_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index a64890964ba22876c97d4a2048ef5e8126ec6bdc..9e898c30e2119d4491057ffaabf05de5b48fb1df 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -9,11 +9,9 @@
 #include "base/timer/timer.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/renderer_host/backing_store.h"
-#include "content/browser/renderer_host/input/gesture_event_filter.h"
+#include "content/browser/renderer_host/input/base_gesture_event_filter.h"
 #include "content/browser/renderer_host/input/immediate_input_router.h"
 #include "content/browser/renderer_host/input/mock_web_input_event_builders.h"
-#include "content/browser/renderer_host/input/tap_suppression_controller.h"
-#include "content/browser/renderer_host/input/tap_suppression_controller_client.h"
 #include "content/browser/renderer_host/input/touch_event_queue.h"
 #include "content/browser/renderer_host/overscroll_controller.h"
 #include "content/browser/renderer_host/overscroll_controller_delegate.h"
@@ -244,7 +242,7 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
   }
 
   bool FlingInProgress() const {
-    return gesture_event_filter()->fling_in_progress_;
+    return immediate_input_router_->flinger_->fling_in_progress_;
   }
 
   bool WillIgnoreNextACK() const {
@@ -315,14 +313,12 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
     return immediate_input_router_->touch_event_queue_.get();
   }
 
-  const GestureEventFilter* gesture_event_filter() const {
-    return static_cast<GestureEventFilter*>(
-        immediate_input_router_->gesture_event_filter());
+  const BaseGestureEventFilter* gesture_event_filter() const {
+    return immediate_input_router_->event_filter_.get();
   }
 
-  GestureEventFilter* gesture_event_filter() {
-    return static_cast<GestureEventFilter*>(
-        immediate_input_router_->gesture_event_filter());
+  BaseGestureEventFilter* gesture_event_filter() {
+    return immediate_input_router_->event_filter_.get();
   }
 
  private: