Revert of [Sync] Componentize ProfileSyncComponentsFactoryImpl

chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc

 // Copyright 2014 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/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
@@ skipping 31 matching lines @@
 #endif
 
 using extensions::PreferencesPrivateGetSyncCategoriesWithoutPassphraseFunction;
 
 namespace {
 
 class FakeProfileSyncService : public ProfileSyncService {
  public:
   explicit FakeProfileSyncService(Profile* profile)
       : ProfileSyncService(
-            make_scoped_ptr(new browser_sync::ChromeSyncClient(profile)),
+            make_scoped_ptr(new browser_sync::ChromeSyncClient(
+                profile,
+                make_scoped_ptr(new SyncApiComponentFactoryMock()))),
             make_scoped_ptr<SigninManagerWrapper>(NULL),
             ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
             browser_sync::MANUAL_START,
             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()),
         sync_initialized_(true),
-        initialized_state_violation_(false) {
-    static_cast<browser_sync::ChromeSyncClient*>(GetSyncClient())
-        ->SetSyncApiComponentFactoryForTesting(
-            make_scoped_ptr(new SyncApiComponentFactoryMock()));
-  }
+        initialized_state_violation_(false) {}
 
   ~FakeProfileSyncService() override {}
 
   static scoped_ptr<KeyedService> BuildFakeProfileSyncService(
       content::BrowserContext* context) {
     return make_scoped_ptr(
         new FakeProfileSyncService(static_cast<Profile*>(context)));
   }
 
   void set_sync_initialized(bool sync_initialized) {
@@ skipping 124 matching lines @@
 
 // Verifies that we wait for the sync service to be ready before checking
 // encryption status.
 IN_PROC_BROWSER_TEST_F(PreferencesPrivateApiTest,
                        GetSyncCategoriesWithoutPassphraseAsynchronous) {
   service_->set_sync_initialized(false);
   TestGetSyncCategoriesWithoutPassphraseFunction();
 }
 
 }  // namespace