Revert of [Sync] Componentize ProfileSyncComponentsFactoryImpl

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

Index: chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc
diff --git a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc
index 57c7350fc7307c24690dfcb9d0fc1e340ea5814b..83934219d5053dd5ff2c601748b478a37e0d7e98 100644
--- a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc
+++ b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc
@@ -49,7 +49,9 @@
  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,
@@ -64,11 +66,7 @@
                 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 {}