Introduce ProfileInvalidationProvider wrapper for InvalidationService

chrome/browser/drive/drive_notification_manager_factory.cc

Index: chrome/browser/drive/drive_notification_manager_factory.cc
diff --git a/chrome/browser/drive/drive_notification_manager_factory.cc b/chrome/browser/drive/drive_notification_manager_factory.cc
index bec2c9ca8972dfb44fc25b791a16ebad1fddca27..5a3d4373514674d2c5b70f91f0d30ab438d7472f 100644
--- a/chrome/browser/drive/drive_notification_manager_factory.cc
+++ b/chrome/browser/drive/drive_notification_manager_factory.cc
@@ -6,7 +6,8 @@
 
 #include "base/logging.h"
 #include "chrome/browser/drive/drive_notification_manager.h"
-#include "chrome/browser/invalidation/invalidation_service_factory.h"
+#include "chrome/browser/invalidation/profile_invalidation_provider.h"
+#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
@@ -28,7 +29,7 @@ DriveNotificationManagerFactory::GetForBrowserContext(
     content::BrowserContext* context) {
   if (!ProfileSyncService::IsSyncEnabled())
     return NULL;
-  if (!invalidation::InvalidationServiceFactory::GetForProfile(
+  if (!invalidation::ProfileInvalidationProviderFactory::GetForProfile(
           Profile::FromBrowserContext(context))) {
     // Do not create a DriveNotificationManager for |context|s that do not
     // support invalidation.
@@ -50,18 +51,21 @@ DriveNotificationManagerFactory::DriveNotificationManagerFactory()
         "DriveNotificationManager",
         BrowserContextDependencyManager::GetInstance()) {
   DependsOn(ProfileSyncServiceFactory::GetInstance());
-  DependsOn(invalidation::InvalidationServiceFactory::GetInstance());
+  DependsOn(invalidation::ProfileInvalidationProviderFactory::GetInstance());
 }
 
 DriveNotificationManagerFactory::~DriveNotificationManagerFactory() {}
 
 KeyedService* DriveNotificationManagerFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
-  invalidation::InvalidationService* invalidation_service =
-      invalidation::InvalidationServiceFactory::GetForProfile(
+

[hashimoto, 2014/06/12 02:20:46]

nit: Unneeded blank line.

[bartfab (slow), 2014/06/12 09:21:14]

Done.

+  invalidation::ProfileInvalidationProvider* invalidation_provider =
+      invalidation::ProfileInvalidationProviderFactory::GetForProfile(
           Profile::FromBrowserContext(context));
-  DCHECK(invalidation_service);
-  return new DriveNotificationManager(invalidation_service);
+  DCHECK(invalidation_provider);
+  DCHECK(invalidation_provider->GetInvalidationService());
+  return new DriveNotificationManager(
+      invalidation_provider->GetInvalidationService());
 }
 
 }  // namespace drive