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

content/browser/renderer_host/render_widget_host_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #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"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/common/input_messages.h"
 #include "content/common/view_messages.h"
 #include "content/port/browser/render_widget_host_view_port.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
@@ skipping 210 matching lines @@
 
   WebGestureEvent GestureEventQueueEventAt(int i) const {
     return gesture_event_filter()->coalesced_gesture_events_.at(i).event;
   }
 
   bool ScrollingInProgress() const {
     return gesture_event_filter()->scrolling_in_progress_;
   }
 
   bool FlingInProgress() const {
-    return gesture_event_filter()->fling_in_progress_;
+    return immediate_input_router_->flinger_->fling_in_progress_;
   }
 
   bool WillIgnoreNextACK() const {
     return gesture_event_filter()->ignore_next_ack_;
   }
 
   void SetupForOverscrollControllerTest() {
     SetOverscrollControllerEnabled(true);
     overscroll_delegate_.reset(new TestOverscrollDelegate(GetView()));
     overscroll_controller_->set_delegate(overscroll_delegate_.get());
@@ skipping 50 matching lines @@
 
  protected:
   virtual void NotifyRendererUnresponsive() OVERRIDE {
     unresponsive_timer_fired_ = true;
   }
 
   const TouchEventQueue* touch_event_queue() const {
     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:
   bool unresponsive_timer_fired_;
 
   // |immediate_input_router_| and |mock_input_router_| are owned by
   // RenderWidgetHostImpl |input_router_|. Below are provided for convenience so
   // that we don't have to reinterpret_cast it all the time.
   ImmediateInputRouter* immediate_input_router_;
   MockInputRouter* mock_input_router_;
@@ skipping 2178 matching lines @@
 
 TEST_F(RenderWidgetHostTest, InputRouterReceivesHasTouchEventHandlers) {
   host_->SetupForInputRouterTest();
 
   host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true));
 
   EXPECT_TRUE(host_->mock_input_router()->message_received_);
 }
 
 }  // namespace content