Remove references to Profile from browser_context_keyed_service.

BUG=227219
R=joi@chromium.org

Review URL: https://codereview.chromium.org/15517005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201634 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 12 insertions, 10 deletions

diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h
index 49dd7d4..7d8a54a 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h
@@ -27,7 +27,7 @@ struct CloudPrintProxyInfo;
 // running in the service process.
 class CloudPrintProxyService
     : public CloudPrintSetupHandlerDelegate,
-      public ProfileKeyedService {
+      public BrowserContextKeyedService {
  public:
   explicit CloudPrintProxyService(Profile* profile);
   virtual ~CloudPrintProxyService();
diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.cc
index c33c939..0e79f61 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.cc
@@ -12,7 +12,7 @@
 CloudPrintProxyService* CloudPrintProxyServiceFactory::GetForProfile(
     Profile* profile) {
   return static_cast<CloudPrintProxyService*>(
-      GetInstance()->GetServiceForProfile(profile, true));
+      GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 CloudPrintProxyServiceFactory* CloudPrintProxyServiceFactory::GetInstance() {
@@ -20,14 +20,16 @@ CloudPrintProxyServiceFactory* CloudPrintProxyServiceFactory::GetInstance() {
 }
 
 CloudPrintProxyServiceFactory::CloudPrintProxyServiceFactory()
-    : ProfileKeyedServiceFactory("CloudPrintProxyService",
-                                 ProfileDependencyManager::GetInstance()) {
+    : BrowserContextKeyedServiceFactory(
+        "CloudPrintProxyService",
+        BrowserContextDependencyManager::GetInstance()) {
 }
 
 CloudPrintProxyServiceFactory::~CloudPrintProxyServiceFactory() {
 }
 
-ProfileKeyedService* CloudPrintProxyServiceFactory::BuildServiceInstanceFor(
+BrowserContextKeyedService*
+CloudPrintProxyServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
   CloudPrintProxyService* service =
       new CloudPrintProxyService(static_cast<Profile*>(profile));
diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h
index b320b48..a3e07b68 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h
@@ -15,7 +15,7 @@ class Profile;
 // Singleton that owns all CloudPrintProxyServices and associates them with
 // Profiles. Listens for the Profile's destruction notification and cleans up
 // the associated CloudPrintProxyService.
-class CloudPrintProxyServiceFactory : public ProfileKeyedServiceFactory {
+class CloudPrintProxyServiceFactory : public BrowserContextKeyedServiceFactory {
  public:
   // Returns the CloudPrintProxyService for |profile|, creating if not yet
   // created.
@@ -29,8 +29,8 @@ class CloudPrintProxyServiceFactory : public ProfileKeyedServiceFactory {
   CloudPrintProxyServiceFactory();
   virtual ~CloudPrintProxyServiceFactory();
 
-  // ProfileKeyedServiceFactory:
-  virtual ProfileKeyedService* BuildServiceInstanceFor(
+  // BrowserContextKeyedServiceFactory:
+  virtual BrowserContextKeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const OVERRIDE;
   virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
 };
diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
index c92d30b..d6eefc5 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
@@ -422,7 +422,7 @@ TEST_F(CloudPrintProxyPolicyTest,
             prefs->GetString(prefs::kCloudPrintEmail));
 }
 
-ProfileKeyedService* TestCloudPrintProxyServiceFactory(
+BrowserContextKeyedService* TestCloudPrintProxyServiceFactory(
     content::BrowserContext* profile) {
   TestCloudPrintProxyService* service =
       new TestCloudPrintProxyService(static_cast<Profile*>(profile));
diff --git a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
index 5658776..2f8de5e 100644
--- a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
+++ b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
@@ -455,7 +455,7 @@ TEST_F(CloudPrintProxyPolicyStartupTest, StartAndShutdown) {
   ShutdownAndWaitForExitWithTimeout(handle);
 }
 
-ProfileKeyedService* CloudPrintProxyServiceFactoryForPolicyTest(
+BrowserContextKeyedService* CloudPrintProxyServiceFactoryForPolicyTest(
     content::BrowserContext* profile) {
   CloudPrintProxyService* service =
       new CloudPrintProxyService(static_cast<Profile*>(profile));