[Sync] Replace ProfileSyncComponentsFactory with SyncClient

chrome/browser/sync/chrome_sync_client.cc

Index: chrome/browser/sync/chrome_sync_client.cc
diff --git a/chrome/browser/sync/chrome_sync_client.cc b/chrome/browser/sync/chrome_sync_client.cc
index ec310e45fa3f352c8d549284f456506f3659b7e4..1fd2f0bbe140e94955c1b36056d288323111ee4a 100644
--- a/chrome/browser/sync/chrome_sync_client.cc
+++ b/chrome/browser/sync/chrome_sync_client.cc
@@ -69,14 +69,25 @@ namespace browser_sync {
 
 ChromeSyncClient::ChromeSyncClient(
     Profile* profile,
-    ProfileSyncComponentsFactoryImpl* component_factory)
+    sync_driver::SyncApiComponentFactory* component_factory)
     : profile_(profile),
       component_factory_(component_factory) {
-  // Must be called on UI thread.
+}
+ChromeSyncClient::~ChromeSyncClient() {
+}
+
+void ChromeSyncClient::Initialize(sync_driver::SyncService* sync_service) {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  sync_service_ = sync_service;
   web_data_service_ = GetWebDataService();

[stanisc, 2015/08/27 22:14:04]

Since these two functions are called here and the return values are stored,
should they be protected rather than public?

[Nicolas Zea, 2015/08/27 23:37:15]

They're called externally too, but on the UI thread. It's only
GetSyncableServiceForType that needs to make use of them on a different thread.

   password_store_ = GetPasswordStore();
 }
-ChromeSyncClient::~ChromeSyncClient() {
+
+sync_driver::SyncService* ChromeSyncClient::GetSyncService() {
+  // TODO(zea): bring back this DCHECK after Typed URLs are converted to
+  // SyncableService.
+  // DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  return sync_service_;
 }
 
 PrefService* ChromeSyncClient::GetPrefService() {
@@ -237,71 +248,8 @@ ChromeSyncClient::GetSyncableServiceForType(syncer::ModelType type) {
   }
 }
 
-scoped_ptr<syncer::AttachmentService> ChromeSyncClient::CreateAttachmentService(
-    scoped_ptr<syncer::AttachmentStoreForSync> attachment_store,
-    const syncer::UserShare& user_share,
-    const std::string& store_birthday,
-    syncer::ModelType model_type,
-    syncer::AttachmentService::Delegate* delegate) {
-  return GetProfileSyncComponentsFactoryImpl()
-      ->CreateAttachmentService(attachment_store.Pass(), user_share,
-                                store_birthday, model_type, delegate)
-      .Pass();
-}
-
-void ChromeSyncClient::RegisterDataTypes(ProfileSyncService* pss) {
-  component_factory_->RegisterDataTypes(pss);
-}
-
-sync_driver::DataTypeManager* ChromeSyncClient::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) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  return component_factory_->CreateDataTypeManager(
-      debug_info_listener, controllers, encryption_handler, backend, observer);
-}
-
-browser_sync::SyncBackendHost* ChromeSyncClient::CreateSyncBackendHost(
-    const std::string& name,
-    Profile* profile,
-    invalidation::InvalidationService* invalidator,
-    const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,
-    const base::FilePath& sync_folder) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  return component_factory_->CreateSyncBackendHost(name, profile, invalidator,
-                                                   sync_prefs, sync_folder);
-}
-
-scoped_ptr<sync_driver::LocalDeviceInfoProvider>
-    ChromeSyncClient::CreateLocalDeviceInfoProvider() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  return component_factory_->CreateLocalDeviceInfoProvider();
-}
-
-ProfileSyncComponentsFactory::SyncComponents
-ChromeSyncClient::CreateBookmarkSyncComponents(
-    ProfileSyncService* profile_sync_service,
-    sync_driver::DataTypeErrorHandler* error_handler) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  return component_factory_->CreateBookmarkSyncComponents(profile_sync_service,
-                                                          error_handler);
-}
-
-ProfileSyncComponentsFactory::SyncComponents
-ChromeSyncClient::CreateTypedUrlSyncComponents(
-    ProfileSyncService* profile_sync_service,
-    history::HistoryBackend* history_backend,
-    sync_driver::DataTypeErrorHandler* error_handler) {
-  return component_factory_->CreateTypedUrlSyncComponents(
-      profile_sync_service, history_backend, error_handler);
-}
-
-ProfileSyncComponentsFactoryImpl*
-ChromeSyncClient::GetProfileSyncComponentsFactoryImpl() {
+sync_driver::SyncApiComponentFactory*
+ChromeSyncClient::GetSyncApiComponentFactory() {
   return component_factory_;
 }