Revert of Consolidate all touch/gesture related constants in content

content/public/common/content_switches.cc

Index: content/public/common/content_switches.cc
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index eadab38becefee1aca8958b9924e97fdeb2ebf00..f42b07f6b407de412548da9e223b2abf673fd3f1 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -160,6 +160,9 @@
 
 // Disable Stage3D inside of flapper.
 const char kDisableFlashStage3d[]           = "disable-flash-stage3d";
+
+// Disable deferral of scroll-ending gesture events when a scroll is active.
+const char kDisableGestureDebounce[]        = "disable-gesture-debounce";
 
 const char kDisableGestureTapHighlight[]    = "disable-gesture-tap-highlight";
 
@@ -836,6 +839,10 @@
 // Type of the current test harness ("browser" or "ui").
 const char kTestType[]                      = "test-type";
 
+// Enable timeout-based touch event cancellation if a touch ack is delayed.
+// If unspecified, touch timeout behavior will be disabled.
+const char kTouchAckTimeoutDelayMs[]        = "touch-ack-timeout-delay-ms";
+
 const char kTouchScrollingMode[]            = "touch-scrolling-mode";
 const char kTouchScrollingModeAsyncTouchmove[] = "async-touchmove";
 const char kTouchScrollingModeSyncTouchmove[] = "sync-touchmove";