Remove references to Profile from browser_context_keyed_service.

chrome/browser/speech/chrome_speech_recognition_preferences.h

 // 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.
 
 #ifndef CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_
 #define CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 34 matching lines @@
 
   // Called only by Chrome (on UI thread).
   void SetFilterProfanities(bool filter_profanities);
   void ToggleFilterProfanities();
   bool ShouldShowSecurityNotification(const std::string& context_name) const;
   void SetHasShownSecurityNotification(const std::string& context_name);
 
  private:
   // The two classes below are needed to handle storage of speech recognition
   // preferences in profile preferences, according to the Chromium Profile
-  // Architecture document entitled "The New Way: ProfileKeyedServiceFactory".
+  // Architecture document entitled "The New Way:
+  // BrowserContextKeyedServiceFactory".
 
   // Singleton that manages instantiation of ChromeSpeechRecognitionPreferences
   // handling its association with Profiles.
-  class Factory : public ProfileKeyedServiceFactory {
+  class Factory : public BrowserContextKeyedServiceFactory {
    public:
     static Factory* GetInstance();
     scoped_refptr<ChromeSpeechRecognitionPreferences> GetForProfile(
         Profile* profile);
 
    private:
     friend struct DefaultSingletonTraits<Factory>;
 
     Factory();
     virtual ~Factory();
 
-    // ProfileKeyedServiceFactory methods:
-    virtual ProfileKeyedService* BuildServiceInstanceFor(
+    // BrowserContextKeyedServiceFactory methods:
+    virtual BrowserContextKeyedService* BuildServiceInstanceFor(
         content::BrowserContext* profile) const OVERRIDE;
     virtual void RegisterUserPrefs(
         user_prefs::PrefRegistrySyncable* registry) OVERRIDE;
     virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
-    virtual bool ServiceIsCreatedWithProfile() const OVERRIDE;
+    virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE;
 
     DISALLOW_COPY_AND_ASSIGN(Factory);
   };
 
   // This wrapper handles the binding between ChromeSpeechRecognitionPreferences
   // instances (which can have a longer lifetime, since they are refcounted) and
-  // ProfileKeyedService (which lifetime depends on the Profile service). Upon
-  // profile shutdown, the ChromeSpeechRecognitionPreferences instance is
+  // BrowserContextKeyedService (which lifetime depends on the Profile service).
+  // Upon profile shutdown, the ChromeSpeechRecognitionPreferences instance is
   // detached from profile, meaning that after that point its clients can still
   // use it, but preferences will no longer be kept in sync with the profile.
-  class Service : public ProfileKeyedService {
+  class Service : public BrowserContextKeyedService {
    public:
     explicit Service(Profile* profile);
     virtual ~Service();
 
-    // ProfileKeyedService implementation.
+    // BrowserContextKeyedService implementation.
     virtual void Shutdown() OVERRIDE;
 
     scoped_refptr<ChromeSpeechRecognitionPreferences> GetPreferences() const;
 
    private:
     scoped_refptr<ChromeSpeechRecognitionPreferences> preferences_;
 
     DISALLOW_COPY_AND_ASSIGN(Service);
   };
 
@@ skipping 10 matching lines @@
   scoped_ptr<base::ListValue> notifications_shown_;
 
   // Lock used to ensure exclusive access to preference variables that are
   // accessed by both threads (note: mutable is required to keep getters const).
   mutable base::Lock preferences_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeSpeechRecognitionPreferences);
 };
 
 #endif  // CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_