[Sync] Componentize ProfileSyncComponentsFactoryImpl

chrome/browser/sync/profile_sync_service_unittest.cc

Index: chrome/browser/sync/profile_sync_service_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index 5a651f746da12cd1cfb71c7184e332fc70c3c88b..bc05cb55febc3c521fdbef9749bf8df495ce7ec6 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -105,12 +105,9 @@ using testing::_;
 
 class TestChromeSyncClient : public ChromeSyncClient {
  public:
-  TestChromeSyncClient(
-      Profile* profile,
-      scoped_ptr<sync_driver::SyncApiComponentFactory> component_factory,
-      sync_driver::ClearBrowsingDataCallback callback)
-      : ChromeSyncClient(profile, component_factory.Pass()),
-        callback_(callback) {}
+  TestChromeSyncClient(Profile* profile,
+                       sync_driver::ClearBrowsingDataCallback callback)
+      : ChromeSyncClient(profile), callback_(callback) {}
   ~TestChromeSyncClient() override {}
 
  private:
@@ -300,13 +297,9 @@ class ProfileSyncServiceTest : public ::testing::Test {
     signin->SetAuthenticatedAccountInfo(kGaiaId, kEmail);
     ProfileOAuth2TokenService* oauth2_token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
-    scoped_ptr<SyncApiComponentFactoryMock> components_factory(
-        new SyncApiComponentFactoryMock());
-    components_factory_ = components_factory.get();
     scoped_ptr<ChromeSyncClient> sync_client(new TestChromeSyncClient(
-        profile_, components_factory.Pass(),
-        base::Bind(&ProfileSyncServiceTest::ClearBrowsingDataCallback,
-                   base::Unretained(this))));
+        profile_, base::Bind(&ProfileSyncServiceTest::ClearBrowsingDataCallback,
+                             base::Unretained(this))));
     service_.reset(new ProfileSyncService(
         sync_client.Pass(),
         make_scoped_ptr(new SigninManagerWrapper(signin)), oauth2_token_service,
@@ -318,6 +311,12 @@ class ProfileSyncServiceTest : public ::testing::Test {
         content::BrowserThread::GetMessageLoopProxyForThread(
             content::BrowserThread::FILE),
         content::BrowserThread::GetBlockingPool()));
+
+    scoped_ptr<SyncApiComponentFactoryMock> components_factory(
+        new SyncApiComponentFactoryMock());
+    components_factory_ = components_factory.get();
+    service_->GetSyncClient()->Initialize(components_factory.Pass(),
+                                          service_.get());
     service_->RegisterDataTypeController(
         new sync_driver::FakeDataTypeController(syncer::BOOKMARKS));
   }
@@ -391,14 +390,14 @@ class ProfileSyncServiceTest : public ::testing::Test {
   }
 
   void ExpectSyncBackendHostCreation(int times) {
-    EXPECT_CALL(*components_factory_, CreateSyncBackendHost(_, _, _, _, _))
+    EXPECT_CALL(*components_factory_, CreateSyncBackendHost(_, _, _, _))
         .Times(times)
         .WillRepeatedly(ReturnNewSyncBackendHostMock());
   }
 
   void ExpectSyncBackendHostCreationCollectDeleteDir(
       int times, std::vector<bool> *delete_dir_param) {
-    EXPECT_CALL(*components_factory_, CreateSyncBackendHost(_, _, _, _, _))
+    EXPECT_CALL(*components_factory_, CreateSyncBackendHost(_, _, _, _))
         .Times(times)
         .WillRepeatedly(
             ReturnNewMockHostCollectDeleteDirParam(delete_dir_param));
@@ -406,13 +405,13 @@ class ProfileSyncServiceTest : public ::testing::Test {
 
   void ExpectSyncBackendHostCreationCaptureClearServerData(
       syncer::SyncManager::ClearServerDataCallback* captured_callback) {
-    EXPECT_CALL(*components_factory_, CreateSyncBackendHost(_, _, _, _, _))
+    EXPECT_CALL(*components_factory_, CreateSyncBackendHost(_, _, _, _))
         .Times(1)
         .WillOnce(ReturnNewMockHostCaptureClearServerData(captured_callback));
   }
 
   void PrepareDelayedInitSyncBackendHost() {
-    EXPECT_CALL(*components_factory_, CreateSyncBackendHost(_, _, _, _, _))
+    EXPECT_CALL(*components_factory_, CreateSyncBackendHost(_, _, _, _))
         .WillOnce(ReturnNewSyncBackendHostNoReturn());
   }