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

6 files changed, 22 insertions, 19 deletions

diff --git a/chrome/browser/invalidation/invalidation_frontend.h b/chrome/browser/invalidation/invalidation_frontend.h
index 8344e27..f8b61a5 100644
--- a/chrome/browser/invalidation/invalidation_frontend.h
+++ b/chrome/browser/invalidation/invalidation_frontend.h
@@ -45,7 +45,7 @@ namespace invalidation {
 // It is an error to have registered handlers when an InvalidationFrontend is
 // shut down; clients must ensure that they unregister themselves before then.
 //
-// TODO(rlarocque): This class should extend ProfileKeyedService.
+// TODO(rlarocque): This class should extend BrowserContextKeyedService.
 //
 // NOTE(akalin): Invalidations that come in during browser shutdown may get
 // dropped.  This won't matter once we have an Acknowledge API, though: see
diff --git a/chrome/browser/invalidation/invalidation_service_android.h b/chrome/browser/invalidation/invalidation_service_android.h
index f7452ef..6daef6a 100644
--- a/chrome/browser/invalidation/invalidation_service_android.h
+++ b/chrome/browser/invalidation/invalidation_service_android.h
@@ -24,7 +24,7 @@ namespace invalidation {
 // around Android's invalidations service.
 class InvalidationServiceAndroid
     : public base::NonThreadSafe,
-      public ProfileKeyedService,
+      public BrowserContextKeyedService,
       public InvalidationFrontend,
       public content::NotificationObserver {
  public:
diff --git a/chrome/browser/invalidation/invalidation_service_factory.cc b/chrome/browser/invalidation/invalidation_service_factory.cc
index d5d3b17..0fa857b 100644
--- a/chrome/browser/invalidation/invalidation_service_factory.cc
+++ b/chrome/browser/invalidation/invalidation_service_factory.cc
@@ -19,12 +19,12 @@ class TokenService;
 namespace invalidation {
 
 // TODO(rlarocque): Re-enable this once InvalidationFrontend can
-// extend ProfileKeyedService.
+// extend BrowserContextKeyedService.
 // // static
 // InvalidationFrontend* InvalidationServiceFactory::GetForProfile(
 //     Profile* profile) {
 //   return static_cast<InvalidationFrontend*>(
-//       GetInstance()->GetServiceForProfile(profile, true));
+//       GetInstance()->GetServiceForBrowserContext(profile, true));
 // }
 
 // static
@@ -33,8 +33,9 @@ InvalidationServiceFactory* InvalidationServiceFactory::GetInstance() {
 }
 
 InvalidationServiceFactory::InvalidationServiceFactory()
-    : ProfileKeyedServiceFactory("InvalidationService",
-                                 ProfileDependencyManager::GetInstance()) {
+    : BrowserContextKeyedServiceFactory(
+        "InvalidationService",
+        BrowserContextDependencyManager::GetInstance()) {
 #if !defined(OS_ANDROID)
   DependsOn(SigninManagerFactory::GetInstance());
   DependsOn(TokenServiceFactory::GetInstance());
@@ -44,12 +45,12 @@ InvalidationServiceFactory::InvalidationServiceFactory()
 InvalidationServiceFactory::~InvalidationServiceFactory() {}
 
 // static
-ProfileKeyedService*
+BrowserContextKeyedService*
 InvalidationServiceFactory::BuildP2PInvalidationServiceFor(Profile* profile) {
   return new P2PInvalidationService(profile);
 }
 
-ProfileKeyedService* InvalidationServiceFactory::BuildServiceInstanceFor(
+BrowserContextKeyedService* InvalidationServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   Profile* profile = static_cast<Profile*>(context);
 #if defined(OS_ANDROID)
diff --git a/chrome/browser/invalidation/invalidation_service_factory.h b/chrome/browser/invalidation/invalidation_service_factory.h
index 0b86143..da6900a 100644
--- a/chrome/browser/invalidation/invalidation_service_factory.h
+++ b/chrome/browser/invalidation/invalidation_service_factory.h
@@ -18,21 +18,23 @@ class Profile;
 
 namespace invalidation {
 
-// A ProfileKeyedServiceFactory to construct InvalidationServices.  The
+// A BrowserContextKeyedServiceFactory to construct InvalidationServices.  The
 // implementation of the InvalidationService may be completely different on
 // different platforms; this class should help to hide this complexity.  It also
 // exposes some factory methods that are useful for setting up tests that rely
 // on invalidations.
-class InvalidationServiceFactory : public ProfileKeyedServiceFactory {
+class InvalidationServiceFactory : public BrowserContextKeyedServiceFactory {
  public:
   // TODO(rlarocque): Re-enable this once InvalidationFrontend can extend
-  // ProfileKeyedService.
+  // BrowserContextKeyedService.
   // static InvalidationFrontend* GetForProfile(Profile* profile);
 
   static InvalidationServiceFactory* GetInstance();
 
-  static ProfileKeyedService* BuildP2PInvalidationServiceFor(Profile* profile);
-  static ProfileKeyedService* BuildTestServiceInstanceFor(Profile* profile);
+  static BrowserContextKeyedService* BuildP2PInvalidationServiceFor(
+      Profile* profile);
+  static BrowserContextKeyedService* BuildTestServiceInstanceFor(
+      Profile* profile);
 
  private:
   friend struct DefaultSingletonTraits<InvalidationServiceFactory>;
@@ -40,8 +42,8 @@ class InvalidationServiceFactory : public ProfileKeyedServiceFactory {
   InvalidationServiceFactory();
   virtual ~InvalidationServiceFactory();
 
-  // ProfileKeyedServiceFactory:
-  virtual ProfileKeyedService* BuildServiceInstanceFor(
+  // BrowserContextKeyedServiceFactory:
+  virtual BrowserContextKeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const OVERRIDE;
   // TODO(rlarocque): Use this class, not InvalidatorStorage, to register
   // for user prefs.
diff --git a/chrome/browser/invalidation/p2p_invalidation_service.h b/chrome/browser/invalidation/p2p_invalidation_service.h
index 8ec1fa2..b624688 100644
--- a/chrome/browser/invalidation/p2p_invalidation_service.h
+++ b/chrome/browser/invalidation/p2p_invalidation_service.h
@@ -23,13 +23,13 @@ namespace invalidation {
 // only in tests, where we're unable to connect to a real invalidations server.
 class P2PInvalidationService
     : public base::NonThreadSafe,
-      public ProfileKeyedService,
+      public BrowserContextKeyedService,
       public InvalidationFrontend {
  public:
   explicit P2PInvalidationService(Profile* profile);
   virtual ~P2PInvalidationService();
 
-  // Overrides ProfileKeyedService method.
+  // Overrides BrowserContextKeyedService method.
   virtual void Shutdown() OVERRIDE;
 
   // InvalidationFrontend implementation.
diff --git a/chrome/browser/invalidation/ticl_invalidation_service.h b/chrome/browser/invalidation/ticl_invalidation_service.h
index 137198a..dde6606 100644
--- a/chrome/browser/invalidation/ticl_invalidation_service.h
+++ b/chrome/browser/invalidation/ticl_invalidation_service.h
@@ -30,7 +30,7 @@ namespace invalidation {
 // It provides invalidations for desktop platforms (Win, Mac, Linux).
 class TiclInvalidationService
     : public base::NonThreadSafe,
-      public ProfileKeyedService,
+      public BrowserContextKeyedService,
       public InvalidationFrontend,
       public content::NotificationObserver,
       public syncer::InvalidationHandler {
@@ -68,7 +68,7 @@ class TiclInvalidationService
   virtual void OnIncomingInvalidation(
       const syncer::ObjectIdInvalidationMap& invalidation_map) OVERRIDE;
 
-  // Overrides ProfileKeyedService method.
+  // Overrides BrowserContextKeyedService method.
   virtual void Shutdown() OVERRIDE;
 
  protected: