Revert of [Sync] Componentize ProfileSyncComponentsFactoryImpl

components/sync_driver/sync_api_component_factory_mock.h

Index: components/sync_driver/sync_api_component_factory_mock.h
diff --git a/components/sync_driver/sync_api_component_factory_mock.h b/components/sync_driver/sync_api_component_factory_mock.h
index f89e5025b6fc3009b190563344e4c420c477489f..70899c5112508aeb8d521d8b891ec4c9a9809750 100644
--- a/components/sync_driver/sync_api_component_factory_mock.h
+++ b/components/sync_driver/sync_api_component_factory_mock.h
@@ -29,7 +29,7 @@
       sync_driver::ChangeProcessor* change_processor);
   ~SyncApiComponentFactoryMock() override;
 
-  MOCK_METHOD1(RegisterDataTypes, void(const RegisterDataTypesMethod&));
+  MOCK_METHOD1(RegisterDataTypes, void(sync_driver::SyncClient*));
   MOCK_METHOD5(CreateDataTypeManager,
                sync_driver::DataTypeManager*(
                    const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&,
@@ -37,9 +37,10 @@
                    const sync_driver::DataTypeEncryptionHandler*,
                    browser_sync::SyncBackendHost*,
                    sync_driver::DataTypeManagerObserver* observer));
-  MOCK_METHOD4(CreateSyncBackendHost,
+  MOCK_METHOD5(CreateSyncBackendHost,
                browser_sync::SyncBackendHost*(
                    const std::string& name,
+                   sync_driver::SyncClient* sync_client,
                    invalidation::InvalidationService* invalidator,
                    const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,
                    const base::FilePath& sync_folder));