Adopt ui::GestureConfiguration on Android

content/browser/renderer_host/input/input_router_config_helper.cc

Index: content/browser/renderer_host/input/input_router_config_helper.cc
diff --git a/content/browser/renderer_host/input/input_router_config_helper.cc b/content/browser/renderer_host/input/input_router_config_helper.cc
index 1956fe65107ba5ff43a8323a03391566bd632753..c0014c3e8695241de34f587943575d8ed83a4b93 100644
--- a/content/browser/renderer_host/input/input_router_config_helper.cc
+++ b/content/browser/renderer_host/input/input_router_config_helper.cc
@@ -9,7 +9,7 @@
 #include "ui/events/gesture_detection/gesture_detector.h"
 
 #if defined(USE_AURA)
-#include "ui/events/gestures/gesture_configuration.h"
+#include "ui/events/gesture_detection/gesture_configuration.h"
 #elif defined(OS_ANDROID)
 #include "ui/gfx/android/view_configuration.h"
 #include "ui/gfx/screen.h"
@@ -23,26 +23,29 @@ namespace {
 GestureEventQueue::Config GetGestureEventQueueConfig() {
   GestureEventQueue::Config config;
 
-  config.debounce_interval = base::TimeDelta::FromMilliseconds(
-      ui::GestureConfiguration::scroll_debounce_interval_in_ms());
+  config.debounce_interval =
+      base::TimeDelta::FromMilliseconds(ui::GestureConfiguration::GetInstance()

[jdduke (slow), 2014/10/22 17:31:33]

To cut down on noise I would just cache the GestureConfiguration instance at the
top, then re-use it below.

[lanwei, 2014/10/23 01:26:17]

Done.

+                                            ->scroll_debounce_interval_in_ms());
 
   config.touchscreen_tap_suppression_config.enabled = true;
   config.touchscreen_tap_suppression_config.max_cancel_to_down_time =
       base::TimeDelta::FromMilliseconds(
-          ui::GestureConfiguration::fling_max_cancel_to_down_time_in_ms());
+          ui::GestureConfiguration::GetInstance()
+              ->fling_max_cancel_to_down_time_in_ms());
 
   config.touchscreen_tap_suppression_config.max_tap_gap_time =
-      base::TimeDelta::FromMilliseconds(
-          ui::GestureConfiguration::semi_long_press_time_in_ms());
+      base::TimeDelta::FromMilliseconds(ui::GestureConfiguration::GetInstance()
+                                            ->semi_long_press_time_in_ms());
 
   config.touchpad_tap_suppression_config.enabled = true;
   config.touchpad_tap_suppression_config.max_cancel_to_down_time =
       base::TimeDelta::FromMilliseconds(
-          ui::GestureConfiguration::fling_max_cancel_to_down_time_in_ms());
+          ui::GestureConfiguration::GetInstance()
+              ->fling_max_cancel_to_down_time_in_ms());
 
   config.touchpad_tap_suppression_config.max_tap_gap_time =
-      base::TimeDelta::FromMilliseconds(
-          ui::GestureConfiguration::fling_max_tap_gap_time_in_ms());
+      base::TimeDelta::FromMilliseconds(ui::GestureConfiguration::GetInstance()
+                                            ->fling_max_tap_gap_time_in_ms());
 
   return config;
 }
@@ -51,7 +54,8 @@ TouchEventQueue::Config GetTouchEventQueueConfig() {
   TouchEventQueue::Config config;
 
   config.touchmove_slop_suppression_length_dips =
-      ui::GestureConfiguration::max_touch_move_in_pixels_for_click();
+      ui::GestureConfiguration::GetInstance()
+          ->max_touch_move_in_pixels_for_click();
 
   return config;
 }