Revert of [Sync] Componentize ProfileSyncComponentsFactoryImpl

chrome/browser/sync/profile_sync_service_mock.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/profile_sync_service_mock.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/prefs/testing_pref_store.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/chrome_sync_client.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/sync_driver/signin_manager_wrapper.h"
 #include "components/sync_driver/sync_api_component_factory_mock.h"
 
 ProfileSyncServiceMock::ProfileSyncServiceMock(Profile* profile)
     : ProfileSyncServiceMock(
-          make_scoped_ptr(new browser_sync::ChromeSyncClient(profile)),
-          profile) {
-  static_cast<browser_sync::ChromeSyncClient*>(GetSyncClient())
-      ->SetSyncApiComponentFactoryForTesting(
-          make_scoped_ptr(new SyncApiComponentFactoryMock()));
-}
+          make_scoped_ptr(
+              new browser_sync::ChromeSyncClient(
+                  profile,
+                  make_scoped_ptr(new SyncApiComponentFactoryMock())))
+              .Pass(),
+          profile) {}
 
 ProfileSyncServiceMock::ProfileSyncServiceMock(
     scoped_ptr<sync_driver::SyncClient> sync_client,
     Profile* profile)
     : ProfileSyncService(
           sync_client.Pass(),
           make_scoped_ptr(new SigninManagerWrapper(
               SigninManagerFactory::GetForProfile(profile))),
           ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
           browser_sync::MANUAL_START,
@@ skipping 20 matching lines @@
       SetAuthenticatedAccountInfo("12345", "foo");
   return profile;
 }
 
 // static
 scoped_ptr<KeyedService> ProfileSyncServiceMock::BuildMockProfileSyncService(
     content::BrowserContext* profile) {
   return make_scoped_ptr(
       new ProfileSyncServiceMock(static_cast<Profile*>(profile)));
 }