Adopt ui::GestureConfiguration on Android

chrome/browser/ui/gesture_prefs_observer_factory_aura.cc

Index: chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
diff --git a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
index b529fea2ba2ea647541ac10b9f5e901cc6cbce5c..fd2af987705afb2dbd1df1db2462a93742c07675 100644
--- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
+++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
@@ -21,7 +21,7 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/overscroll_configuration.h"
 #include "content/public/common/renderer_preferences.h"
-#include "ui/events/gestures/gesture_configuration.h"
+#include "ui/events/gesture_detection/gesture_configuration.h"
 
 using ui::GestureConfiguration;
 
@@ -143,16 +143,17 @@ void GesturePrefsObserver::Shutdown() {
 }
 
 void GesturePrefsObserver::Update() {
-  GestureConfiguration::set_fling_max_cancel_to_down_time_in_ms(
+  GestureConfiguration::GetInstance()->set_fling_max_cancel_to_down_time_in_ms(
       prefs_->GetInteger(prefs::kFlingMaxCancelToDownTimeInMs));
-  GestureConfiguration::set_fling_max_tap_gap_time_in_ms(
+  GestureConfiguration::GetInstance()->set_fling_max_tap_gap_time_in_ms(
       prefs_->GetInteger(prefs::kFlingMaxTapGapTimeInMs));
-  GestureConfiguration::set_tab_scrub_activation_delay_in_ms(
+  GestureConfiguration::GetInstance()->set_tab_scrub_activation_delay_in_ms(
       prefs_->GetInteger(prefs::kTabScrubActivationDelayInMS));
-  GestureConfiguration::set_semi_long_press_time_in_seconds(
+  GestureConfiguration::GetInstance()->set_semi_long_press_time_in_seconds(
       prefs_->GetDouble(prefs::kSemiLongPressTimeInSeconds));
-  GestureConfiguration::set_max_separation_for_gesture_touches_in_pixels(
-      prefs_->GetDouble(prefs::kMaxSeparationForGestureTouchesInPixels));
+  GestureConfiguration::GetInstance()
+      ->set_max_separation_for_gesture_touches_in_pixels(
+          prefs_->GetDouble(prefs::kMaxSeparationForGestureTouchesInPixels));
 
   UpdateOverscrollPrefs();
 }
@@ -210,23 +211,25 @@ void GesturePrefsObserverFactoryAura::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(
       prefs::kFlingMaxCancelToDownTimeInMs,
-      GestureConfiguration::fling_max_cancel_to_down_time_in_ms(),
+      GestureConfiguration::GetInstance()
+          ->fling_max_cancel_to_down_time_in_ms(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(
       prefs::kFlingMaxTapGapTimeInMs,
-      GestureConfiguration::fling_max_tap_gap_time_in_ms(),
+      GestureConfiguration::GetInstance()->fling_max_tap_gap_time_in_ms(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(
       prefs::kTabScrubActivationDelayInMS,
-      GestureConfiguration::tab_scrub_activation_delay_in_ms(),
+      GestureConfiguration::GetInstance()->tab_scrub_activation_delay_in_ms(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterDoublePref(
       prefs::kSemiLongPressTimeInSeconds,
-      GestureConfiguration::semi_long_press_time_in_seconds(),
+      GestureConfiguration::GetInstance()->semi_long_press_time_in_seconds(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterDoublePref(
       prefs::kMaxSeparationForGestureTouchesInPixels,
-      GestureConfiguration::max_separation_for_gesture_touches_in_pixels(),
+      GestureConfiguration::GetInstance()
+          ->max_separation_for_gesture_touches_in_pixels(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   RegisterOverscrollPrefs(registry);
 }