Remove references to Profile from browser_context_keyed_service.

chrome/browser/search_engines/template_url_service_factory.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/search_engines/template_url_service_factory.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 
 // static
 TemplateURLService* TemplateURLServiceFactory::GetForProfile(Profile* profile) {
   return static_cast<TemplateURLService*>(
-      GetInstance()->GetServiceForProfile(profile, true));
+      GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
 TemplateURLServiceFactory* TemplateURLServiceFactory::GetInstance() {
   return Singleton<TemplateURLServiceFactory>::get();
 }
 
 // static
-ProfileKeyedService* TemplateURLServiceFactory::BuildInstanceFor(
+BrowserContextKeyedService* TemplateURLServiceFactory::BuildInstanceFor(
     content::BrowserContext* profile) {
   return new TemplateURLService(static_cast<Profile*>(profile));
 }
 
 TemplateURLServiceFactory::TemplateURLServiceFactory()
-    : ProfileKeyedServiceFactory("TemplateURLServiceFactory",
-                                 ProfileDependencyManager::GetInstance()) {
+    : BrowserContextKeyedServiceFactory("TemplateURLServiceFactory",
+                                 BrowserContextDependencyManager::GetInstance()) {
   DependsOn(GoogleURLTrackerFactory::GetInstance());
   DependsOn(HistoryServiceFactory::GetInstance());
   DependsOn(WebDataServiceFactory::GetInstance());
 }
 
 TemplateURLServiceFactory::~TemplateURLServiceFactory() {}
 
-ProfileKeyedService* TemplateURLServiceFactory::BuildServiceInstanceFor(
+BrowserContextKeyedService* TemplateURLServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
   return BuildInstanceFor(static_cast<Profile*>(profile));
 }
 
 void TemplateURLServiceFactory::RegisterUserPrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterStringPref(prefs::kSyncedDefaultSearchProviderGUID,
                                std::string(),
                                user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
@@ skipping 50 matching lines @@
   // incognito profiles so that search-term-replacement can be disabled in
   // incognito (see crbug.com/232065). Switch back to a shared instance once
   // this is no longer necessary.
   return chrome::GetBrowserContextOwnInstanceInIncognito(context);
 }
 
 bool TemplateURLServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }
 
-void TemplateURLServiceFactory::ProfileShutdown(
+void TemplateURLServiceFactory::BrowserContextShutdown(
     content::BrowserContext* profile) {
   // We shutdown AND destroy the TemplateURLService during this pass.
   // TemplateURLService schedules a task on the WebDataService from its
   // destructor. Delete it first to ensure the task gets scheduled before we
   // shut down the database.
-  ProfileKeyedServiceFactory::ProfileShutdown(profile);
-  ProfileKeyedServiceFactory::ProfileDestroyed(profile);
+  BrowserContextKeyedServiceFactory::BrowserContextShutdown(profile);
+  BrowserContextKeyedServiceFactory::BrowserContextDestroyed(profile);
 }
 
-void TemplateURLServiceFactory::ProfileDestroyed(
+void TemplateURLServiceFactory::BrowserContextDestroyed(
     content::BrowserContext* profile) {
   // Don't double delete.
 }