Revert of [Sync] Componentize ProfileSyncComponentsFactoryImpl

chrome/browser/sync/test_profile_sync_service.cc

Index: chrome/browser/sync/test_profile_sync_service.cc
diff --git a/chrome/browser/sync/test_profile_sync_service.cc b/chrome/browser/sync/test_profile_sync_service.cc
index 2a724d843eed44cdf8ad7064680b63092491d2a4..ea7778bed8ab176e142895cb3392eb8f3af88202 100644
--- a/chrome/browser/sync/test_profile_sync_service.cc
+++ b/chrome/browser/sync/test_profile_sync_service.cc
@@ -126,24 +126,22 @@
     SigninManagerBase* signin,
     ProfileOAuth2TokenService* oauth2_token_service,
     browser_sync::ProfileSyncServiceStartBehavior behavior)
-    : ProfileSyncService(
-          make_scoped_ptr(new browser_sync::ChromeSyncClient(profile)),
-          make_scoped_ptr(new SigninManagerWrapper(signin)),
-          oauth2_token_service,
-          behavior,
-          base::Bind(&EmptyNetworkTimeUpdate),
-          profile->GetPath(),
-          profile->GetRequestContext(),
-          profile->GetDebugName(),
-          chrome::GetChannel(),
-          content::BrowserThread::GetMessageLoopProxyForThread(
-              content::BrowserThread::DB),
-          content::BrowserThread::GetMessageLoopProxyForThread(
-              content::BrowserThread::FILE),
-          content::BrowserThread::GetBlockingPool()) {
-  static_cast<browser_sync::ChromeSyncClient*>(GetSyncClient())
-      ->SetSyncApiComponentFactoryForTesting(
-          make_scoped_ptr(new SyncApiComponentFactoryMock));
+    : ProfileSyncService(make_scoped_ptr(new browser_sync::ChromeSyncClient(
+                             profile,
+                             make_scoped_ptr(new SyncApiComponentFactoryMock))),
+                         make_scoped_ptr(new SigninManagerWrapper(signin)),
+                         oauth2_token_service,
+                         behavior,
+                         base::Bind(&EmptyNetworkTimeUpdate),
+                         profile->GetPath(),
+                         profile->GetRequestContext(),
+                         profile->GetDebugName(),
+                         chrome::GetChannel(),
+                         content::BrowserThread::GetMessageLoopProxyForThread(
+                             content::BrowserThread::DB),
+                         content::BrowserThread::GetMessageLoopProxyForThread(
+                             content::BrowserThread::FILE),
+                         content::BrowserThread::GetBlockingPool()) {
   SetSyncSetupCompleted();
 }
 
@@ -171,8 +169,9 @@
   SyncApiComponentFactoryMock* components =
       sync_service->GetSyncApiComponentFactoryMock();
   // TODO(tim): Convert to a fake instead of mock.
-  EXPECT_CALL(*components, CreateSyncBackendHost(testing::_, testing::_,
-                                                 testing::_, testing::_))
+  EXPECT_CALL(*components,
+              CreateSyncBackendHost(testing::_, testing::_, testing::_,
+                                    testing::_, testing::_))
       .WillOnce(
           testing::Return(new browser_sync::SyncBackendHostForProfileSyncTest(
               profile, sync_service->GetSyncClient(),