[Sync] Replace ProfileSyncComponentsFactory with SyncClient

chrome/browser/sync/profile_sync_components_factory_mock.h

Index: chrome/browser/sync/profile_sync_components_factory_mock.h
diff --git a/chrome/browser/sync/profile_sync_components_factory_mock.h b/chrome/browser/sync/profile_sync_components_factory_mock.h
index 0d584df3df86e9e4627fe093e9295e774e1756bb..c6f83b1860b17c1d41ada8443206dc0b4e90633e 100644
--- a/chrome/browser/sync/profile_sync_components_factory_mock.h
+++ b/chrome/browser/sync/profile_sync_components_factory_mock.h
@@ -6,10 +6,9 @@
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_MOCK_H__
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/sync/profile_sync_service.h"
 #include "components/sync_driver/data_type_controller.h"
 #include "components/sync_driver/data_type_error_handler.h"
-#include "components/sync_driver/profile_sync_components_factory.h"
+#include "components/sync_driver/sync_api_component_factory.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ -20,7 +19,8 @@ class DataTypeEncryptionHandler;
 class DataTypeStatusTable;
 }
 
-class ProfileSyncComponentsFactoryMock : public ProfileSyncComponentsFactory {
+class ProfileSyncComponentsFactoryMock
+    : public sync_driver::SyncApiComponentFactory {
  public:
   ProfileSyncComponentsFactoryMock();
   ProfileSyncComponentsFactoryMock(
@@ -28,7 +28,8 @@ class ProfileSyncComponentsFactoryMock : public ProfileSyncComponentsFactory {
       sync_driver::ChangeProcessor* change_processor);
   ~ProfileSyncComponentsFactoryMock() override;
 
-  MOCK_METHOD1(RegisterDataTypes, void(ProfileSyncService*));
+  MOCK_METHOD1(Initialize, void(sync_driver::SyncService*));
+  MOCK_METHOD0(RegisterDataTypes, void());
   MOCK_METHOD5(CreateDataTypeManager,
                sync_driver::DataTypeManager*(
                    const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&,
@@ -36,10 +37,9 @@ class ProfileSyncComponentsFactoryMock : public ProfileSyncComponentsFactory {
                    const sync_driver::DataTypeEncryptionHandler*,
                    browser_sync::SyncBackendHost*,
                    sync_driver::DataTypeManagerObserver* observer));
-  MOCK_METHOD5(CreateSyncBackendHost,
+  MOCK_METHOD4(CreateSyncBackendHost,
                browser_sync::SyncBackendHost*(
                    const std::string& name,
-                   Profile* profile,
                    invalidation::InvalidationService* invalidator,
                    const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,
                    const base::FilePath& sync_folder));
@@ -49,8 +49,6 @@ class ProfileSyncComponentsFactoryMock : public ProfileSyncComponentsFactory {
   void SetLocalDeviceInfoProvider(
       scoped_ptr<sync_driver::LocalDeviceInfoProvider> local_device);
 
-  MOCK_METHOD1(GetSyncableServiceForType,
-               base::WeakPtr<syncer::SyncableService>(syncer::ModelType));
   scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
       scoped_ptr<syncer::AttachmentStoreForSync> attachment_store,
       const syncer::UserShare& user_share,
@@ -58,21 +56,16 @@ class ProfileSyncComponentsFactoryMock : public ProfileSyncComponentsFactory {
       syncer::ModelType model_type,
       syncer::AttachmentService::Delegate* delegate) override;
   MOCK_METHOD2(CreateBookmarkSyncComponents,
-      SyncComponents(ProfileSyncService* profile_sync_service,
+      SyncComponents(sync_driver::SyncService* sync_service,
                      sync_driver::DataTypeErrorHandler* error_handler));
-#if defined(ENABLE_THEMES)
-  MOCK_METHOD2(CreateThemeSyncComponents,
-      SyncComponents(ProfileSyncService* profile_sync_service,
-                     sync_driver::DataTypeErrorHandler* error_handler));
-#endif
   MOCK_METHOD3(CreateTypedUrlSyncComponents,
                SyncComponents(
-                   ProfileSyncService* profile_sync_service,
+                   sync_driver::SyncService* sync_service,
                    history::HistoryBackend* history_backend,
                    sync_driver::DataTypeErrorHandler* error_handler));
 
  private:
-  SyncComponents MakeSyncComponents();
+  sync_driver::SyncApiComponentFactory::SyncComponents MakeSyncComponents();
 
   scoped_ptr<sync_driver::AssociatorInterface> model_associator_;
   scoped_ptr<sync_driver::ChangeProcessor> change_processor_;