Revert of [Sync] Componentize ProfileSyncComponentsFactoryImpl

components/sync_driver/sync_api_component_factory.h

 // 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.
 
 #ifndef COMPONENTS_SYNC_DRIVER_SYNC_API_COMPONENT_FACTORY_H_
 #define COMPONENTS_SYNC_DRIVER_SYNC_API_COMPONENT_FACTORY_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 39 matching lines @@
 class LocalDeviceInfoProvider;
 class SyncPrefs;
 class SyncClient;
 class SyncService;
 
 // This factory provides sync driver code with the model type specific sync/api
 // service (like SyncableService) implementations.
 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
   // because the change processors typically require a type-specific
   // model associator at construction time.
   //
   // Note: This interface is deprecated in favor of the SyncableService API.
   // New datatypes that do not live on the UI thread should directly return a
   // weak pointer to a syncer::SyncableService. All others continue to return
   // SyncComponents. It is safe to assume that the factory methods below are
   // called on the same thread in which the datatype resides.
   //
   // TODO(zea): Have all datatypes using the new API switch to returning
   // SyncableService weak pointers instead of SyncComponents (crbug.com/100114).
   struct SyncComponents {
     sync_driver::AssociatorInterface* model_associator;
     sync_driver::ChangeProcessor* change_processor;
     SyncComponents(sync_driver::AssociatorInterface* ma,
                    sync_driver::ChangeProcessor* cp)
         : model_associator(ma), change_processor(cp) {}
   };
 
   // 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
   // owned by the caller.
   virtual sync_driver::DataTypeManager* CreateDataTypeManager(
       const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&
           debug_info_listener,
       const sync_driver::DataTypeController::TypeMap* controllers,
       const sync_driver::DataTypeEncryptionHandler* encryption_handler,
       browser_sync::SyncBackendHost* backend,
       sync_driver::DataTypeManagerObserver* observer) = 0;
 
   // 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;
 
   // Creating this in the factory helps us mock it out in testing.
   virtual scoped_ptr<sync_driver::LocalDeviceInfoProvider>
       CreateLocalDeviceInfoProvider() = 0;
 
   // Legacy datatypes that need to be converted to the SyncableService API.
   virtual SyncComponents CreateBookmarkSyncComponents(
@@ skipping 19 matching lines @@
       scoped_ptr<syncer::AttachmentStoreForSync> attachment_store,
       const syncer::UserShare& user_share,
       const std::string& store_birthday,
       syncer::ModelType model_type,
       syncer::AttachmentService::Delegate* delegate) = 0;
 };
 
 }  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_SYNC_API_COMPONENT_FACTORY_H_