Revert of [Sync] Componentize ProfileSyncComponentsFactoryImpl

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 "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 108 matching lines @@
 syncer::WeakHandle<syncer::JsEventHandler>
 TestProfileSyncService::GetJsEventHandler() {
   return syncer::WeakHandle<syncer::JsEventHandler>();
 }
 
 TestProfileSyncService::TestProfileSyncService(
     Profile* profile,
     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();
 }
 
 TestProfileSyncService::~TestProfileSyncService() {
 }
 
 // static
 scoped_ptr<KeyedService> TestProfileSyncService::TestFactoryFunction(
     content::BrowserContext* context) {
   Profile* profile = static_cast<Profile*>(context);
   SigninManagerBase* signin =
       SigninManagerFactory::GetForProfile(profile);
   ProfileOAuth2TokenService* oauth2_token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
   return make_scoped_ptr(new TestProfileSyncService(
       profile, signin, oauth2_token_service, browser_sync::AUTO_START));
 }
 
 // static
 TestProfileSyncService* TestProfileSyncService::BuildAutoStartAsyncInit(
     Profile* profile, base::Closure callback) {
   TestProfileSyncService* sync_service = static_cast<TestProfileSyncService*>(
         ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
             profile, &TestProfileSyncService::TestFactoryFunction));
   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(),
               BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
               invalidation::ProfileInvalidationProviderFactory::GetForProfile(
                   profile)
                   ->GetInvalidationService(),
               sync_service->sync_prefs_.AsWeakPtr(), callback)));
   return sync_service;
 }
@@ skipping 11 matching lines @@
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
 UserShare* TestProfileSyncService::GetUserShare() const {
   return backend_->GetUserShare();
 }
 
 bool TestProfileSyncService::NeedBackup() const {
   return false;
 }