Revert of [Sync] Componentize ProfileSyncComponentsFactoryImpl

components/sync_driver/sync_client.h

Index: components/sync_driver/sync_client.h
diff --git a/components/sync_driver/sync_client.h b/components/sync_driver/sync_client.h
index 5f44d1de7815f02b99e2019b4d6e98e69e0a9af0..fda584dd0cdc6fb64ada9b97545d938096ea3d3f 100644
--- a/components/sync_driver/sync_client.h
+++ b/components/sync_driver/sync_client.h
@@ -10,7 +10,6 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
-#include "components/sync_driver/sync_api_component_factory.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
 #include "sync/util/extensions_activity.h"
@@ -54,6 +53,7 @@
 
 namespace sync_driver {
 
+class SyncApiComponentFactory;
 class SyncService;
 
 typedef base::Callback<void(base::Time, base::Time)> ClearBrowsingDataCallback;
@@ -69,7 +69,9 @@
   SyncClient();
   virtual ~SyncClient();
 
-  // Initializes the sync client with the specified sync service.
+  // Initializes the sync client with the specified sync service. This will also
+  // register data type controllers with |service| (via
+  // SyncApiComponentFactory::RegisterDataTypes).
   virtual void Initialize(SyncService* service) = 0;
 
   // Returns the current SyncService instance.
@@ -87,11 +89,6 @@
   // Returns a callback that will be invoked when the sync service wishes to
   // have browsing data cleared.
   virtual ClearBrowsingDataCallback GetClearBrowsingDataCallback() = 0;
-
-  // Returns a callback that will register the types specific to the current
-  // platform.
-  virtual sync_driver::SyncApiComponentFactory::RegisterDataTypesMethod
-  GetRegisterPlatformTypesCallback() = 0;
 
   // Returns a callback that will be invoked when password sync state has
   // potentially been changed.