Introduce ProfileInvalidationProvider wrapper for InvalidationService

chrome/browser/drive/drive_notification_manager_factory.cc

 // Copyright 2013 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/drive/drive_notification_manager_factory.h"
 
 #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"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
 namespace drive {
 
 // static
 DriveNotificationManager*
 DriveNotificationManagerFactory::FindForBrowserContext(
     content::BrowserContext* context) {
   return static_cast<DriveNotificationManager*>(
       GetInstance()->GetServiceForBrowserContext(context, false));
 }
 
 // static
 DriveNotificationManager*
 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.
     return NULL;
   }
 
   return static_cast<DriveNotificationManager*>(
       GetInstance()->GetServiceForBrowserContext(context, true));
 }
 
 // static
 DriveNotificationManagerFactory*
 DriveNotificationManagerFactory::GetInstance() {
   return Singleton<DriveNotificationManagerFactory>::get();
 }
 
 DriveNotificationManagerFactory::DriveNotificationManagerFactory()
     : BrowserContextKeyedServiceFactory(
         "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