Introduce ProfileInvalidationProvider wrapper for InvalidationService

chrome/browser/sync/test_profile_sync_service.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/sync/test_profile_sync_service.h"
 
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/invalidation/invalidation_service_factory.h"
+#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/glue/sync_backend_host_core.h"
 #include "chrome/browser/sync/managed_user_signin_manager_wrapper.h"
 #include "chrome/browser/sync/profile_sync_components_factory.h"
 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/test/test_http_bridge_factory.h"
+#include "components/invalidation/profile_invalidation_provider.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "sync/internal_api/public/test/sync_manager_factory_for_profile_sync_test.h"
 #include "sync/internal_api/public/test/test_internal_components_factory.h"
 #include "sync/internal_api/public/user_share.h"
 #include "sync/protocol/encryption.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using syncer::InternalComponentsFactory;
 using syncer::TestInternalComponentsFactory;
 using syncer::UserShare;
@@ skipping 112 matching lines @@
             profile, &TestProfileSyncService::TestFactoryFunction));
   ProfileSyncComponentsFactoryMock* components =
       sync_service->components_factory_mock();
   // TODO(tim): Convert to a fake instead of mock.
   EXPECT_CALL(*components,
               CreateSyncBackendHost(testing::_,testing::_, testing::_,
                                     testing::_, testing::_)).
       WillOnce(testing::Return(
           new browser_sync::SyncBackendHostForProfileSyncTest(
               profile,
-              invalidation::InvalidationServiceFactory::GetForProfile(profile),
+              invalidation::ProfileInvalidationProviderFactory::GetForProfile(
+                  profile)->GetInvalidationService(),
               sync_service->sync_prefs_.AsWeakPtr(),
               callback)));
   return sync_service;
 }
 
 ProfileSyncComponentsFactoryMock*
 TestProfileSyncService::components_factory_mock() {
   // We always create a mock factory, see Build* routines.
   return static_cast<ProfileSyncComponentsFactoryMock*>(factory());
 }
 
 void TestProfileSyncService::OnConfigureDone(
     const browser_sync::DataTypeManager::ConfigureResult& result) {
   ProfileSyncService::OnConfigureDone(result);
   base::MessageLoop::current()->Quit();
 }
 
 UserShare* TestProfileSyncService::GetUserShare() const {
   return backend_->GetUserShare();
 }