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 18c5560a5391f2cca0063ca61c22a937cf8088ff..52f59bb7c84570c18a7d5ed777d47c6be4fa051e 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,32 @@ 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()
+                                            ->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(static_cast<int>(
-          ui::GestureConfiguration::semi_long_press_time_in_seconds() * 1000));
+      base::TimeDelta::FromMilliseconds(
+          static_cast<int>(ui::GestureConfiguration::GetInstance()
+                               ->semi_long_press_time_in_seconds() *
+                           1000));
 
   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(static_cast<int>(
-          ui::GestureConfiguration::fling_max_tap_gap_time_in_ms() * 1000));
+  config.touchpad_tap_suppression_config
+      .max_tap_gap_time = base::TimeDelta::FromMilliseconds(static_cast<int>(
+      ui::GestureConfiguration::GetInstance()->fling_max_tap_gap_time_in_ms() *
+      1000));
 
   return config;
 }
@@ -51,7 +57,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;
 }