Revert of [Sync] Componentize ProfileSyncComponentsFactoryImpl

components/sync_driver/sync_api_component_factory.h

Index: components/sync_driver/sync_api_component_factory.h
diff --git a/components/sync_driver/sync_api_component_factory.h b/components/sync_driver/sync_api_component_factory.h
index d64bba157b7cf149618b60fbb5fb0eaf23665025..937fd73c6333c6fc2e5e0d82d313b7de93b823f5 100644
--- a/components/sync_driver/sync_api_component_factory.h
+++ b/components/sync_driver/sync_api_component_factory.h
@@ -57,13 +57,6 @@
 class SyncApiComponentFactory {
  public:
   virtual ~SyncApiComponentFactory() {}
-  // Callback to allow platform-specific datatypes to register themselves as
-  // data type controllers.
-  // |disabled_types| and |enabled_types| control the disable/enable state of
-  // types that are on or off by default (respectively).
-  typedef base::Callback<void(syncer::ModelTypeSet disabled_types,
-                              syncer::ModelTypeSet enabled_types)>
-      RegisterDataTypesMethod;
 
   // The various factory methods for the data type model associators
   // and change processors all return this struct.  This is needed
@@ -87,8 +80,7 @@
   };
 
   // Creates and registers enabled datatypes with the provided SyncClient.
-  virtual void RegisterDataTypes(
-      const RegisterDataTypesMethod& register_platform_types_method) = 0;
+  virtual void RegisterDataTypes(sync_driver::SyncClient* sync_client) = 0;
 
   // Instantiates a new DataTypeManager with a SyncBackendHost, a list of data
   // type controllers and a DataTypeManagerObserver.  The return pointer is
@@ -104,6 +96,7 @@
   // Creating this in the factory helps us mock it out in testing.
   virtual browser_sync::SyncBackendHost* CreateSyncBackendHost(
       const std::string& name,
+      SyncClient* sync_client,
       invalidation::InvalidationService* invalidator,
       const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,
       const base::FilePath& sync_folder) = 0;