Consolidate all touch/gesture related constants in content

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 db75239c44cafefc0ba11cb8433081ab472c912d..bd24948fffea4927e55ea3a90c21b39745b3e9b4 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -11,8 +11,6 @@
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/renderer_host/input/gesture_event_queue.h"
 #include "content/browser/renderer_host/input/input_router_impl.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"
@@ -198,7 +196,6 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
       int routing_id)
       : RenderWidgetHostImpl(delegate, process, routing_id, false),
         unresponsive_timer_fired_(false) {
-    input_router_impl_ = static_cast<InputRouterImpl*>(input_router_.get());
     acked_touch_event_type_ = blink::WebInputEvent::Undefined;
   }
 
@@ -249,13 +246,13 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
     overscroll_controller_->set_delegate(overscroll_delegate_.get());
   }
 
-  void DisableGestureDebounce() {
-    gesture_event_queue().set_debounce_enabled_for_testing(false);
+  void SetupForGestureDebouncing(int delay_ms) {
+    gesture_event_queue().set_debounce_enabled_for_testing(true);
+    gesture_event_queue().set_debounce_interval_time_ms_for_testing(delay_ms);
   }
 
-  void set_debounce_interval_time_ms(int delay_ms) {
-    gesture_event_queue().
-        set_debounce_interval_time_ms_for_testing(delay_ms);
+  void DisableGestureDebounce() {
+    gesture_event_queue().set_debounce_enabled_for_testing(false);
   }
 
   bool TouchEventQueueEmpty() const {
@@ -307,12 +304,11 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
   }
 
   void SetupForInputRouterTest() {
-    mock_input_router_ = new MockInputRouter(this);
-    input_router_.reset(mock_input_router_);
+    input_router_.reset(new MockInputRouter(this));
   }
 
   MockInputRouter* mock_input_router() {
-    return mock_input_router_;
+    return static_cast<MockInputRouter*>(input_router_.get());
   }
 
  protected:
@@ -321,27 +317,29 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
   }
 
   const TouchEventQueue& touch_event_queue() const {
-    return input_router_impl_->touch_event_queue_;
+    return input_router_impl()->touch_event_queue_;
   }
 
   const GestureEventQueue& gesture_event_queue() const {
-    return input_router_impl_->gesture_event_queue_;
+    return input_router_impl()->gesture_event_queue_;
   }
 
   GestureEventQueue& gesture_event_queue() {
-    return input_router_impl_->gesture_event_queue_;
+    return input_router_impl()->gesture_event_queue_;
+  }
+
+  const InputRouterImpl* input_router_impl() const {
+    return static_cast<InputRouterImpl*>(input_router_.get());
+  }
+
+  InputRouterImpl* input_router_impl() {
+    return static_cast<InputRouterImpl*>(input_router_.get());
   }
 
  private:
   bool unresponsive_timer_fired_;
   WebInputEvent::Type acked_touch_event_type_;
 
-  // |input_router_impl_| and |mock_input_router_| are owned by
-  // RenderWidgetHostImpl.  The handles below are provided for convenience so
-  // that we don't have to reinterpret_cast it all the time.
-  InputRouterImpl* input_router_impl_;
-  MockInputRouter* mock_input_router_;
-
   scoped_ptr<TestOverscrollDelegate> overscroll_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(MockRenderWidgetHost);
@@ -1658,7 +1656,7 @@ TEST_F(RenderWidgetHostTest, GestureScrollConsumedHorizontal) {
 // gesture event filter with debounce filtering turned on.
 TEST_F(RenderWidgetHostTest, GestureScrollDebounceOverscrolls) {
   host_->SetupForOverscrollControllerTest();
-  host_->set_debounce_interval_time_ms(100);
+  host_->SetupForGestureDebouncing(100);
   process_->sink().ClearMessages();
 
   // Start scrolling. Receive ACK as it being processed.
@@ -1736,7 +1734,7 @@ TEST_F(RenderWidgetHostTest, GestureScrollDebounceOverscrolls) {
 // controller.
 TEST_F(RenderWidgetHostTest, GestureScrollDebounceTimerOverscroll) {
   host_->SetupForOverscrollControllerTest();
-  host_->set_debounce_interval_time_ms(10);
+  host_->SetupForGestureDebouncing(10);
   process_->sink().ClearMessages();
 
   // Start scrolling. Receive ACK as it being processed.
@@ -1796,7 +1794,7 @@ TEST_F(RenderWidgetHostTest, GestureScrollDebounceTimerOverscroll) {
 // gesture deals with them correctly.
 TEST_F(RenderWidgetHostTest, OverscrollWithTouchEvents) {
   host_->SetupForOverscrollControllerTest();
-  host_->set_debounce_interval_time_ms(10);
+  host_->SetupForGestureDebouncing(10);
   host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true));
   process_->sink().ClearMessages();
   view_->set_bounds(gfx::Rect(0, 0, 400, 200));
@@ -1924,7 +1922,7 @@ TEST_F(RenderWidgetHostTest, OverscrollWithTouchEvents) {
 // touch-gesture initiated overscroll.
 TEST_F(RenderWidgetHostTest, TouchGestureEndDispatchedAfterOverscrollComplete) {
   host_->SetupForOverscrollControllerTest();
-  host_->set_debounce_interval_time_ms(10);
+  host_->SetupForGestureDebouncing(10);
   host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true));
   process_->sink().ClearMessages();
   view_->set_bounds(gfx::Rect(0, 0, 400, 200));
@@ -2044,7 +2042,7 @@ TEST_F(RenderWidgetHostTest, TouchGestureEndDispatchedAfterOverscrollComplete) {
 
 TEST_F(RenderWidgetHostTest, OverscrollDirectionChange) {
   host_->SetupForOverscrollControllerTest();
-  host_->set_debounce_interval_time_ms(100);
+  host_->SetupForGestureDebouncing(100);
   process_->sink().ClearMessages();
 
   // Start scrolling. Receive ACK as it being processed.