Remove references to Profile from browser_context_keyed_service.

chrome/browser/speech/chrome_speech_recognition_preferences.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/speech/chrome_speech_recognition_preferences.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 17 matching lines @@
   return Singleton<ChromeSpeechRecognitionPreferences::Factory>::get();
 }
 
 void ChromeSpeechRecognitionPreferences::InitializeFactory() {
   ChromeSpeechRecognitionPreferences::Factory::GetInstance();
 }
 
 scoped_refptr<ChromeSpeechRecognitionPreferences>
 ChromeSpeechRecognitionPreferences::Factory::GetForProfile(Profile* profile) {
   DCHECK(profile);
-  // GetServiceForProfile will let us instantiate a new (if not already cached
-  // for the profile) Service through BuildServiceInstanceFor method.
+  // GetServiceForBrowserContext will let us instantiate a new (if not already
+  // cached for the profile) Service through BuildServiceInstanceFor method.
   ChromeSpeechRecognitionPreferences::Service* service =
       static_cast<ChromeSpeechRecognitionPreferences::Service*>(
-          GetServiceForProfile(profile, true));
+          GetServiceForBrowserContext(profile, true));
 
   if (!service) {
     // Incognito won't have this service.
     return NULL;
   }
 
   return service->GetPreferences();
 }
 
 ChromeSpeechRecognitionPreferences::Factory::Factory()
-    : ProfileKeyedServiceFactory(
+    : BrowserContextKeyedServiceFactory(
         "ChromeSpeechRecognitionPreferences",
-        ProfileDependencyManager::GetInstance()) {
+        BrowserContextDependencyManager::GetInstance()) {
 }
 
 ChromeSpeechRecognitionPreferences::Factory::~Factory() {
 }
 
-ProfileKeyedService*
+BrowserContextKeyedService*
 ChromeSpeechRecognitionPreferences::Factory::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
   DCHECK(profile);
   return new ChromeSpeechRecognitionPreferences::Service(
       static_cast<Profile*>(profile));
 }
 
 void ChromeSpeechRecognitionPreferences::Factory::RegisterUserPrefs(
     user_prefs::PrefRegistrySyncable* prefs) {
   prefs->RegisterBooleanPref(
       prefs::kSpeechRecognitionFilterProfanities,
       kDefaultFilterProfanities,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   prefs->RegisterListPref(
       prefs::kSpeechRecognitionTrayNotificationShownContexts,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 bool ChromeSpeechRecognitionPreferences::Factory::
 ServiceIsNULLWhileTesting() const {
   return true;
 }
 
 bool ChromeSpeechRecognitionPreferences::Factory::
-ServiceIsCreatedWithProfile() const {
+ServiceIsCreatedWithBrowserContext() const {
   return false;
 }
 
 ChromeSpeechRecognitionPreferences::Service::Service(
     Profile* profile)
     : preferences_(new ChromeSpeechRecognitionPreferences(profile)) {
 }
 
 ChromeSpeechRecognitionPreferences::Service::~Service() {
 }
@@ skipping 112 matching lines @@
       prefs::kSpeechRecognitionFilterProfanities);
 }
 
 void ChromeSpeechRecognitionPreferences::ReloadNotificationsShown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   base::AutoLock write_lock(preferences_lock_);
   const base::ListValue* pref_list = profile_->GetPrefs()->GetList(
       prefs::kSpeechRecognitionTrayNotificationShownContexts);
   notifications_shown_.reset(pref_list->DeepCopy());
 }