Remove fling curve profiles from renderer preferences assuming that be turn on

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 5650f1dc5125c3b64a5ac864135f488be1d3f945..b782a0c81210f386fae31fc1411eb0cb13b7c254 100644
--- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
+++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
@@ -135,18 +135,12 @@ const char* kPrefsToObserve[] = {
   prefs::kRailBreakProportion,
   prefs::kRailStartProportion,
   prefs::kSemiLongPressTimeInSeconds,
-};
-
-const char* kFlingTouchpadPrefs[] = {
   prefs::kFlingCurveTouchpadAlpha,
   prefs::kFlingCurveTouchpadBeta,
-  prefs::kFlingCurveTouchpadGamma
-};
-
-const char* kFlingTouchscreenPrefs[] = {
+  prefs::kFlingCurveTouchpadGamma,
   prefs::kFlingCurveTouchscreenAlpha,
   prefs::kFlingCurveTouchscreenBeta,
-  prefs::kFlingCurveTouchscreenGamma,
+  prefs::kFlingCurveTouchscreenGamma
 };
 
 GesturePrefsObserver::GesturePrefsObserver(PrefService* prefs)
@@ -165,12 +159,6 @@ GesturePrefsObserver::GesturePrefsObserver(PrefService* prefs)
     for (size_t i = 0; i < overscroll_prefs.size(); ++i)
       prefs->ClearPref(overscroll_prefs[i].pref_name);
 
-    for (size_t i = 0; i < arraysize(kFlingTouchpadPrefs); ++i)
-      prefs->ClearPref(kFlingTouchpadPrefs[i]);
-
-    for (size_t i = 0; i < arraysize(kFlingTouchscreenPrefs); ++i)
-      prefs->ClearPref(kFlingTouchscreenPrefs[i]);
-
 #if defined(USE_ASH)
     for (size_t i = 0; i < arraysize(kImmersiveModePrefs); ++i)
       prefs->ClearPref(kImmersiveModePrefs[i]);
@@ -194,11 +182,6 @@ GesturePrefsObserver::GesturePrefsObserver(PrefService* prefs)
   for (size_t i = 0; i < overscroll_prefs.size(); ++i)
     registrar_.Add(overscroll_prefs[i].pref_name, callback);
 
-  for (size_t i = 0; i < arraysize(kFlingTouchpadPrefs); ++i)
-    registrar_.Add(kFlingTouchpadPrefs[i], notify_callback);
-  for (size_t i = 0; i < arraysize(kFlingTouchscreenPrefs); ++i)
-    registrar_.Add(kFlingTouchscreenPrefs[i], notify_callback);
-
 #if defined(USE_ASH)
   for (size_t i = 0; i < arraysize(kImmersiveModePrefs); ++i)
     registrar_.Add(kImmersiveModePrefs[i], callback);
@@ -294,6 +277,22 @@ void GesturePrefsObserver::Update() {
   GestureConfiguration::set_show_press_delay_in_ms(
       prefs_->GetInteger(prefs::kShowPressDelayInMS));
 
+  // Fling curve: Touchpad
+  GestureConfiguration::set_touchpad_fling_curve_alpha(
+      prefs_->GetDouble(prefs::kFlingCurveTouchpadAlpha));
+  GestureConfiguration::set_touchpad_fling_curve_beta(
+      prefs_->GetDouble(prefs::kFlingCurveTouchpadBeta));
+  GestureConfiguration::set_touchpad_fling_curve_gamma(
+      prefs_->GetDouble(prefs::kFlingCurveTouchpadGamma));
+
+  // Fling curve: Touchscreen
+  GestureConfiguration::set_touchscreen_fling_curve_alpha(
+      prefs_->GetDouble(prefs::kFlingCurveTouchscreenAlpha));
+  GestureConfiguration::set_touchscreen_fling_curve_beta(
+      prefs_->GetDouble(prefs::kFlingCurveTouchscreenBeta));
+  GestureConfiguration::set_touchscreen_fling_curve_gamma(
+      prefs_->GetDouble(prefs::kFlingCurveTouchscreenGamma));
+
   UpdateOverscrollPrefs();
   UpdateImmersiveModePrefs();
 }
@@ -362,17 +361,33 @@ void GesturePrefsObserverFactoryAura::RegisterFlingCurveParameters(
     user_prefs::PrefRegistrySyncable* registry) {
   content::RendererPreferences def_prefs;
 
-  for (size_t i = 0; i < arraysize(kFlingTouchpadPrefs); i++)
-    registry->RegisterDoublePref(
-        kFlingTouchpadPrefs[i],
-        def_prefs.touchpad_fling_profile[i],
-        user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  // Touchpad
+  registry->RegisterDoublePref(
+      prefs::kFlingCurveTouchpadAlpha,
+      GestureConfiguration::touchpad_fling_curve_alpha(),
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterDoublePref(
+      prefs::kFlingCurveTouchpadBeta,
+      GestureConfiguration::touchpad_fling_curve_beta(),
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterDoublePref(
+      prefs::kFlingCurveTouchpadGamma,
+      GestureConfiguration::touchpad_fling_curve_gamma(),
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 
-  for (size_t i = 0; i < arraysize(kFlingTouchscreenPrefs); i++)
-    registry->RegisterDoublePref(
-        kFlingTouchscreenPrefs[i],
-        def_prefs.touchscreen_fling_profile[i],
-        user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  // Touchscreen
+  registry->RegisterDoublePref(
+      prefs::kFlingCurveTouchscreenAlpha,
+      GestureConfiguration::touchscreen_fling_curve_alpha(),
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterDoublePref(
+      prefs::kFlingCurveTouchscreenBeta,
+      GestureConfiguration::touchscreen_fling_curve_beta(),
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterDoublePref(
+      prefs::kFlingCurveTouchscreenGamma,
+      GestureConfiguration::touchscreen_fling_curve_gamma(),
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 void GesturePrefsObserverFactoryAura::RegisterImmersiveModePrefs(