Change GestureConfiguration types to be consistent with each other and with the

chrome/browser/ui/gesture_prefs_observer_factory_aura.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 75 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(GesturePrefsObserver);
 };
 
 // The list of prefs we want to observe.
 // Note that this collection of settings should correspond to the settings used
 // in ui/events/gestures/gesture_configuration.h
 const char* kPrefsToObserve[] = {
   prefs::kFlingMaxCancelToDownTimeInMs,
   prefs::kFlingMaxTapGapTimeInMs,
-  prefs::kTabScrubActivationDelayInMS,
+  prefs::kTabScrubActivationDelayInMs,
   prefs::kMaxSeparationForGestureTouchesInPixels,
-  prefs::kSemiLongPressTimeInSeconds,
+  prefs::kSemiLongPressTimeInMs,
 };
 
 const char* kPrefsToRemove[] = {
     "gesture.fling_acceleration_curve_coefficient_0",
     "gesture.fling_acceleration_curve_coefficient_1",
     "gesture.fling_acceleration_curve_coefficient_2",
     "gesture.fling_acceleration_curve_coefficient_3",
+    "gesture.semi_long_press_time_in_seconds",
     "flingcurve.touchpad_alpha",
     "flingcurve.touchpad_beta",
     "flingcurve.touchpad_gamma",
     "flingcurve.touchscreen_alpha",
     "flingcurve.touchscreen_beta",
     "flingcurve.touchscreen_gamma",
 };
 
 GesturePrefsObserver::GesturePrefsObserver(PrefService* prefs)
     : prefs_(prefs) {
@@ skipping 25 matching lines @@
 void GesturePrefsObserver::Shutdown() {
   registrar_.RemoveAll();
 }
 
 void GesturePrefsObserver::Update() {
   GestureConfiguration::set_fling_max_cancel_to_down_time_in_ms(
       prefs_->GetInteger(prefs::kFlingMaxCancelToDownTimeInMs));
   GestureConfiguration::set_fling_max_tap_gap_time_in_ms(
       prefs_->GetInteger(prefs::kFlingMaxTapGapTimeInMs));
   GestureConfiguration::set_tab_scrub_activation_delay_in_ms(
-      prefs_->GetInteger(prefs::kTabScrubActivationDelayInMS));
-  GestureConfiguration::set_semi_long_press_time_in_seconds(
-      prefs_->GetDouble(prefs::kSemiLongPressTimeInSeconds));
+      prefs_->GetInteger(prefs::kTabScrubActivationDelayInMs));
+  GestureConfiguration::set_semi_long_press_time_in_ms(
+      prefs_->GetInteger(prefs::kSemiLongPressTimeInMs));
   GestureConfiguration::set_max_separation_for_gesture_touches_in_pixels(
-      prefs_->GetDouble(prefs::kMaxSeparationForGestureTouchesInPixels));
+      static_cast<float>(
+          prefs_->GetDouble(prefs::kMaxSeparationForGestureTouchesInPixels)));
 
   UpdateOverscrollPrefs();
 }
 
 void GesturePrefsObserver::UpdateOverscrollPrefs() {
   const std::vector<OverscrollPref>& overscroll_prefs = GetOverscrollPrefs();
   for (size_t i = 0; i < overscroll_prefs.size(); ++i) {
     content::SetOverscrollConfig(overscroll_prefs[i].config,
         static_cast<float>(prefs_->GetDouble(overscroll_prefs[i].pref_name)));
   }
@@ skipping 44 matching lines @@
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(
       prefs::kFlingMaxCancelToDownTimeInMs,
       GestureConfiguration::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(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(
-      prefs::kTabScrubActivationDelayInMS,
+      prefs::kTabScrubActivationDelayInMs,
       GestureConfiguration::tab_scrub_activation_delay_in_ms(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterDoublePref(
-      prefs::kSemiLongPressTimeInSeconds,
-      GestureConfiguration::semi_long_press_time_in_seconds(),
+  registry->RegisterIntegerPref(
+      prefs::kSemiLongPressTimeInMs,
+      GestureConfiguration::semi_long_press_time_in_ms(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterDoublePref(
       prefs::kMaxSeparationForGestureTouchesInPixels,
       GestureConfiguration::max_separation_for_gesture_touches_in_pixels(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   RegisterOverscrollPrefs(registry);
 }
 
 bool
 GesturePrefsObserverFactoryAura::ServiceIsCreatedWithBrowserContext() const {
   // Create the observer as soon as the profile is created.
   return true;
 }
 
 content::BrowserContext*
 GesturePrefsObserverFactoryAura::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   // Use same gesture preferences on incognito windows.
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool GesturePrefsObserverFactoryAura::ServiceIsNULLWhileTesting() const {
   // Some tests replace the PrefService of the TestingProfile after the
   // GesturePrefsObserver has been created, which makes Shutdown()
   // remove the registrar from a non-existent PrefService.
   return true;
 }