Introduce ProfileInvalidationProvider wrapper for InvalidationService

chrome/browser/sync/profile_sync_service_unittest.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 "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/invalidation/fake_invalidation_service.h"
-#include "chrome/browser/invalidation/invalidation_service_factory.h"
+#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.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_mock.h"
 #include "chrome/browser/sync/managed_user_signin_manager_wrapper.h"
 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
+#include "components/invalidation/invalidation_service.h"
+#include "components/invalidation/profile_invalidation_provider.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/sync_driver/data_type_manager_impl.h"
 #include "components/sync_driver/pref_names.h"
 #include "components/sync_driver/sync_prefs.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace content {
+class BrowserContext;
+}
+
 namespace browser_sync {
 
 namespace {
 
 ACTION(ReturnNewDataTypeManager) {
   return new browser_sync::DataTypeManagerImpl(base::Closure(),
                                                arg0,
                                                arg1,
                                                arg2,
                                                arg3,
@@ skipping 74 matching lines @@
 
 ACTION(ReturnNewSyncBackendHostNoReturn) {
   return new browser_sync::SyncBackendHostNoReturn();
 }
 
 ACTION_P(ReturnNewMockHostCollectDeleteDirParam, delete_dir_param) {
   return new browser_sync::SyncBackendHostMockCollectDeleteDirParam(
       delete_dir_param);
 }
 
+KeyedService* BuildFakeProfileInvalidationProvider(
+    content::BrowserContext* context) {
+  return new invalidation::ProfileInvalidationProvider(
+      scoped_ptr<invalidation::InvalidationService>(
+          new invalidation::FakeInvalidationService));
+}
+
 // A test harness that uses a real ProfileSyncService and in most cases a
 // MockSyncBackendHost.
 //
 // This is useful if we want to test the ProfileSyncService and don't care about
 // testing the SyncBackendHost.
 class ProfileSyncServiceTest : public ::testing::Test {
  protected:
   ProfileSyncServiceTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         profile_manager_(TestingBrowserProcess::GetGlobal()) {}
   virtual ~ProfileSyncServiceTest() {}
 
   virtual void SetUp() OVERRIDE {
     CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kSyncDeferredStartupTimeoutSeconds, "0");
 
     CHECK(profile_manager_.SetUp());
 
     TestingProfile::TestingFactories testing_facotries;
     testing_facotries.push_back(
             std::make_pair(ProfileOAuth2TokenServiceFactory::GetInstance(),
                            BuildAutoIssuingFakeProfileOAuth2TokenService));
     testing_facotries.push_back(
             std::make_pair(
-                invalidation::InvalidationServiceFactory::GetInstance(),
-                invalidation::FakeInvalidationService::Build));
+                invalidation::ProfileInvalidationProviderFactory::GetInstance(),
+                BuildFakeProfileInvalidationProvider));
 
     profile_ = profile_manager_.CreateTestingProfile(
         "sync-service-test", scoped_ptr<PrefServiceSyncable>(),
         base::UTF8ToUTF16("sync-service-test"), 0, std::string(),
         testing_facotries);
   }
 
   virtual void TearDown() OVERRIDE {
     // Kill the service before the profile.
     if (service_)
@@ skipping 401 matching lines @@
 
   EXPECT_EQ(3u, delete_dir_param.size());
   EXPECT_FALSE(delete_dir_param[0]);
   EXPECT_FALSE(delete_dir_param[1]);
   EXPECT_TRUE(delete_dir_param[2]);
 }
 #endif
 
 }  // namespace
 }  // namespace browser_sync