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

content/browser/renderer_host/input/immediate_input_router.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_IMMEDIATE_INPUT_ROUTER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_IMMEDIATE_INPUT_ROUTER_H_
 
 #include <queue>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "content/browser/renderer_host/input/fling/flinger.h"
 #include "content/browser/renderer_host/input/gesture_event_filter_client.h"
 #include "content/browser/renderer_host/input/input_router.h"
 #include "content/browser/renderer_host/input/touch_event_queue.h"
-#include "content/browser/renderer_host/input/touchpad_tap_suppression_controller.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 
 namespace IPC {
 class Sender;
 }
 
 namespace ui {
 struct LatencyInfo;
 }
 
 namespace content {
 class BaseGestureEventFilter;
 class InputAckHandler;
 class InputRouterClient;
 class OverscrollController;
 class RenderWidgetHostImpl;
 
 // A default implementation for browser input event routing. Input commands are
 // forwarded to the renderer immediately upon receipt.
 class CONTENT_EXPORT ImmediateInputRouter
     : public NON_EXPORTED_BASE(InputRouter),
       public NON_EXPORTED_BASE(GestureEventFilterClient),
       public NON_EXPORTED_BASE(TouchEventQueueClient),
-      public NON_EXPORTED_BASE(TouchpadTapSuppressionControllerClient),
       public NON_EXPORTED_BASE(FlingHelper) {
  public:
   ImmediateInputRouter(IPC::Sender* sender,
                        InputRouterClient* client,
                        InputAckHandler* ack_handler,
                        int routing_id);
   virtual ~ImmediateInputRouter();
 
   // InputRouter
   virtual void Flush() OVERRIDE;
@@ skipping 13 matching lines @@
   virtual const NativeWebKeyboardEvent* GetLastKeyboardEvent() const OVERRIDE;
   virtual bool ShouldForwardTouchEvent() const OVERRIDE;
 
   // IPC::Listener
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
 private:
   friend class ImmediateInputRouterTest;
   friend class MockRenderWidgetHost;
 
-  // TouchpadTapSuppressionControllerClient
   virtual void SendMouseEventImmediately(
       const MouseEventWithLatencyInfo& mouse_event) OVERRIDE;
 
   // TouchEventQueueClient
   virtual void SendTouchEventImmediately(
       const TouchEventWithLatencyInfo& touch_event) OVERRIDE;
   virtual void OnTouchEventAck(const TouchEventWithLatencyInfo& event,
                                InputEventAckState ack_result) OVERRIDE;
 
   // GetureEventFilterClient
@@ skipping 84 matching lines @@
 
   void HandleGestureScroll(const GestureEventWithLatencyInfo& gesture_event);
 
   void SimulateTouchGestureWithMouse(
       const MouseEventWithLatencyInfo& mouse_event);
 
   bool IsInOverscrollGesture() const;
 
   int routing_id() const { return routing_id_; }
 
-  BaseGestureEventFilter* gesture_event_filter();
-
   IPC::Sender* sender_;
   InputRouterClient* client_;
   InputAckHandler* ack_handler_;
   int routing_id_;
 
   // (Similar to |mouse_move_pending_|.) True while waiting for SelectRange_ACK.
   bool select_range_pending_;
 
   // (Similar to |next_mouse_move_|.) The next SelectRange to send, if any.
   scoped_ptr<IPC::Message> next_selection_range_;
@@ skipping 44 matching lines @@
   // not sent to the renderer.
   bool has_touch_handler_;
 
   // The source of the ack within the scope of |ProcessInputEventAck()|.
   // Defaults to ACK_SOURCE_NONE.
   AckSource current_ack_source_;
 
   scoped_ptr<TouchEventQueue> touch_event_queue_;
   scoped_ptr<Flinger> flinger_;
 
-  class EventFilteringHelper;
-  scoped_ptr<EventFilteringHelper> event_filter_;
+  scoped_ptr<BaseGestureEventFilter> event_filter_;
 
   enum InputMessageSource {
     MESSAGE_SOURCE_FLING,
     MESSAGE_SOURCE_REGULAR,
   };
 
   std::queue<InputMessageSource> in_process_messages_sources_;
 
   DISALLOW_COPY_AND_ASSIGN(ImmediateInputRouter);
 };
 
 }  // namespace content
 
 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_IMMEDIATE_INPUT_ROUTER_H_