Remove the last usages of PrefObserver outside of Prefs.

chrome/browser/ui/gesture_prefs_observer_factory_aura.cc

 // Copyright (c) 2012 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 "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/public/pref_change_registrar.h"
-#include "base/prefs/public/pref_observer.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/overscroll_configuration.h"
 #include "ui/base/gestures/gesture_configuration.h"
 
 using ui::GestureConfiguration;
 
 namespace {
 
 struct OverscrollPref {
   const char* pref_name;
   content::OverscrollConfig config;
 };
 
 // This class manages gesture configuration preferences.
-class GesturePrefsObserver : public PrefObserver,
-                             public ProfileKeyedService {
+class GesturePrefsObserver : public ProfileKeyedService {
  public:
   explicit GesturePrefsObserver(PrefService* prefs);
   virtual ~GesturePrefsObserver();
 
   static const OverscrollPref* GetOverscrollPrefs() {
     using namespace content;
     static OverscrollPref overscroll_prefs[] = {
       { prefs::kOverscrollHorizontalThresholdComplete,
         OVERSCROLL_CONFIG_HORIZ_THRESHOLD_COMPLETE },
       { prefs::kOverscrollVerticalThresholdComplete,
         OVERSCROLL_CONFIG_VERT_THRESHOLD_COMPLETE },
       { prefs::kOverscrollMinimumThresholdStart,
         OVERSCROLL_CONFIG_MIN_THRESHOLD_START },
       { prefs::kOverscrollHorizontalResistThreshold,
         OVERSCROLL_CONFIG_HORIZ_RESIST_AFTER },
       { prefs::kOverscrollVerticalResistThreshold,
         OVERSCROLL_CONFIG_VERT_RESIST_AFTER },
       { NULL,
         OVERSCROLL_CONFIG_NONE },
     };
 
     return overscroll_prefs;
   }
 
   // ProfileKeyedService implementation.
   virtual void Shutdown() OVERRIDE;
 
-  // PrefObserver implementation.
-  virtual void OnPreferenceChanged(PrefServiceBase* service,
-                                   const std::string& pref_name) OVERRIDE;
-
  private:
   void Update();
 
   void UpdateOverscrollPrefs();
 
   PrefChangeRegistrar registrar_;
   PrefService* prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(GesturePrefsObserver);
 };
@@ skipping 31 matching lines @@
   prefs::kOverscrollVerticalThresholdComplete,
   prefs::kOverscrollMinimumThresholdStart,
   prefs::kOverscrollHorizontalResistThreshold,
   prefs::kOverscrollVerticalResistThreshold,
 };
 
 GesturePrefsObserver::GesturePrefsObserver(PrefService* prefs)
     : prefs_(prefs) {
   registrar_.Init(prefs);
   registrar_.RemoveAll();
+  base::Closure callback = base::Bind(&GesturePrefsObserver::Update,
+                                      base::Unretained(this));
   for (size_t i = 0; i < arraysize(kPrefsToObserve); ++i)
-    registrar_.Add(kPrefsToObserve[i], this);
+    registrar_.Add(kPrefsToObserve[i], callback);
   for (size_t i = 0; i < arraysize(kOverscrollPrefs); ++i)
-    registrar_.Add(kOverscrollPrefs[i], this);
+    registrar_.Add(kOverscrollPrefs[i], callback);
 }
 
 GesturePrefsObserver::~GesturePrefsObserver() {}
 
 void GesturePrefsObserver::Shutdown() {
   registrar_.RemoveAll();
 }
 
-void GesturePrefsObserver::OnPreferenceChanged(PrefServiceBase* service,
-                                               const std::string& pref_name) {
-  Update();
-}
-
 void GesturePrefsObserver::Update() {
   GestureConfiguration::set_fling_acceleration_curve_coefficients(0,
       prefs_->GetDouble(prefs::kFlingAccelerationCurveCoefficient0));
   GestureConfiguration::set_fling_acceleration_curve_coefficients(1,
       prefs_->GetDouble(prefs::kFlingAccelerationCurveCoefficient1));
   GestureConfiguration::set_fling_acceleration_curve_coefficients(2,
       prefs_->GetDouble(prefs::kFlingAccelerationCurveCoefficient2));
   GestureConfiguration::set_fling_acceleration_curve_coefficients(3,
       prefs_->GetDouble(prefs::kFlingAccelerationCurveCoefficient3));
   GestureConfiguration::set_long_press_time_in_seconds(
@@ skipping 212 matching lines @@
   // Use same gesture preferences on incognito windows.
   return true;
 }
 
 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;
 }