Revert of Consolidate all touch/gesture related constants in content

content/browser/renderer_host/input/touchpad_tap_suppression_controller.h

Index: content/browser/renderer_host/input/touchpad_tap_suppression_controller.h
diff --git a/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h b/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h
index 23e3ee4fdaf3b16ba38e8c3f938bfe1e933c5a5b..64b2ed4bc2afe4fcc3ffb886f7bfd2063fa6e592 100644
--- a/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h
+++ b/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCHPAD_TAP_SUPPRESSION_CONTROLLER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCHPAD_TAP_SUPPRESSION_CONTROLLER_H_
 
-#include "content/browser/renderer_host/input/tap_suppression_controller.h"
+#include "base/memory/scoped_ptr.h"
 #include "content/browser/renderer_host/input/tap_suppression_controller_client.h"
 #include "content/common/content_export.h"
 #include "content/port/browser/event_with_latency_info.h"
@@ -27,9 +27,8 @@
 class TouchpadTapSuppressionController : public TapSuppressionControllerClient {
  public:
   // The |client| must outlive the TouchpadTapSupressionController.
-  TouchpadTapSuppressionController(
-      TouchpadTapSuppressionControllerClient* client,
-      const TapSuppressionController::Config& config);
+  explicit TouchpadTapSuppressionController(
+      TouchpadTapSuppressionControllerClient* client);
   virtual ~TouchpadTapSuppressionController();
 
   // Should be called on arrival of GestureFlingCancel events.
@@ -52,6 +51,8 @@
   friend class MockRenderWidgetHost;
 
   // TapSuppressionControllerClient implementation.
+  virtual int MaxCancelToDownTimeInMs() OVERRIDE;
+  virtual int MaxTapGapTimeInMs() OVERRIDE;
   virtual void DropStashedTapDown() OVERRIDE;
   virtual void ForwardStashedTapDown() OVERRIDE;
 
@@ -59,7 +60,7 @@
   MouseEventWithLatencyInfo stashed_mouse_down_;
 
   // The core controller of tap suppression.
-  TapSuppressionController controller_;
+  scoped_ptr<TapSuppressionController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchpadTapSuppressionController);
 };