Remove references to Profile from browser_context_keyed_service.

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 100 matching lines @@
       { prefs::kWorkspaceCyclerStopCyclerAnimationDuration,
         WorkspaceCyclerConfiguration::STOP_CYCLER_ANIMATION_DURATION },
     };
     cycler_prefs.assign(kCyclerPrefs, kCyclerPrefs + arraysize(kCyclerPrefs));
   }
   return cycler_prefs;
 }
 #endif  // USE_ASH
 
 // This class manages gesture configuration preferences.
-class GesturePrefsObserver : public ProfileKeyedService {
+class GesturePrefsObserver : public BrowserContextKeyedService {
  public:
   explicit GesturePrefsObserver(PrefService* prefs);
   virtual ~GesturePrefsObserver();
 
-  // ProfileKeyedService implementation.
+  // BrowserContextKeyedService implementation.
   virtual void Shutdown() OVERRIDE;
 
  private:
   // Notification callback invoked when browser-side preferences
   // are updated and need to be pushed into ui::GesturePreferences.
   void Update();
 
   // Notification callback invoked when the fling deacceleration
   // gesture preferences are changed from chrome://gesture.
   // Broadcasts the changes all renderers where they are used.
@@ skipping 225 matching lines @@
 
 }  // namespace
 
 // static
 GesturePrefsObserverFactoryAura*
 GesturePrefsObserverFactoryAura::GetInstance() {
   return Singleton<GesturePrefsObserverFactoryAura>::get();
 }
 
 GesturePrefsObserverFactoryAura::GesturePrefsObserverFactoryAura()
-    : ProfileKeyedServiceFactory("GesturePrefsObserverAura",
-                                 ProfileDependencyManager::GetInstance()) {}
+    : BrowserContextKeyedServiceFactory(
+        "GesturePrefsObserverAura",
+        BrowserContextDependencyManager::GetInstance()) {}
 
 GesturePrefsObserverFactoryAura::~GesturePrefsObserverFactoryAura() {}
 
-ProfileKeyedService* GesturePrefsObserverFactoryAura::BuildServiceInstanceFor(
+BrowserContextKeyedService*
+GesturePrefsObserverFactoryAura::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
   return new GesturePrefsObserver(static_cast<Profile*>(profile)->GetPrefs());
 }
 
 void GesturePrefsObserverFactoryAura::RegisterOverscrollPrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   const std::vector<OverscrollPref>& overscroll_prefs = GetOverscrollPrefs();
 
   for (size_t i = 0; i < overscroll_prefs.size(); ++i) {
     registry->RegisterDoublePref(
@@ skipping 173 matching lines @@
       kTouchScreenFlingAccelerationAdjustment,
       0.0,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   RegisterOverscrollPrefs(registry);
   RegisterFlingCurveParameters(registry);
   RegisterImmersiveModePrefs(registry);
   RegisterWorkspaceCyclerPrefs(registry);
 }
 
-bool GesturePrefsObserverFactoryAura::ServiceIsCreatedWithProfile() const {
+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;
 }