[Sync] Componentize ProfileSyncComponentsFactoryImpl

components/browser_sync/browser/profile_sync_components_factory_impl.cc

 // Copyright (c) 2012 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.
 
-#include "chrome/browser/sync/profile_sync_components_factory_impl.h"
+#include "components/browser_sync/browser/profile_sync_components_factory_impl.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
 #include "build/build_config.h"
-#include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/browser/sync/glue/theme_data_type_controller.h"
-#include "chrome/common/channel_info.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/pref_names.h"
 #include "components/autofill/core/browser/autofill_wallet_data_type_controller.h"
 #include "components/autofill/core/browser/webdata/autofill_data_type_controller.h"
 #include "components/autofill/core/browser/webdata/autofill_profile_data_type_controller.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/browser_sync/browser/profile_sync_service.h"
 #include "components/browser_sync/common/browser_sync_switches.h"
 #include "components/dom_distiller/core/dom_distiller_features.h"
 #include "components/history/core/browser/history_delete_directives_data_type_controller.h"
 #include "components/history/core/browser/typed_url_change_processor.h"
 #include "components/history/core/browser/typed_url_data_type_controller.h"
 #include "components/history/core/browser/typed_url_model_associator.h"
 #include "components/password_manager/sync/browser/password_data_type_controller.h"
-#include "components/search_engines/search_engine_data_type_controller.h"
 #include "components/sync_bookmarks/bookmark_change_processor.h"
 #include "components/sync_bookmarks/bookmark_data_type_controller.h"
 #include "components/sync_bookmarks/bookmark_model_associator.h"
 #include "components/sync_driver/data_type_manager_impl.h"
 #include "components/sync_driver/device_info_data_type_controller.h"
 #include "components/sync_driver/glue/chrome_report_unrecoverable_error.h"
 #include "components/sync_driver/glue/sync_backend_host.h"
 #include "components/sync_driver/glue/sync_backend_host_impl.h"
 #include "components/sync_driver/local_device_info_provider_impl.h"
 #include "components/sync_driver/proxy_data_type_controller.h"
 #include "components/sync_driver/sync_client.h"
 #include "components/sync_driver/ui_data_type_controller.h"
 #include "components/sync_sessions/session_data_type_controller.h"
 #include "components/variations/variations_associated_data.h"
-#include "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "google_apis/gaia/oauth2_token_service_request.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "sync/internal_api/public/attachments/attachment_downloader.h"
 #include "sync/internal_api/public/attachments/attachment_service.h"
 #include "sync/internal_api/public/attachments/attachment_service_impl.h"
 #include "sync/internal_api/public/attachments/attachment_uploader_impl.h"
-#include "ui/base/device_form_factor.h"
-
-#if defined(ENABLE_APP_LIST)
-#include "ui/app_list/app_list_switches.h"
-#endif
-
-#if defined(ENABLE_EXTENSIONS)
-#include "chrome/browser/sync/glue/extension_data_type_controller.h"
-#include "chrome/browser/sync/glue/extension_setting_data_type_controller.h"
-#endif
-
-#if defined(ENABLE_SUPERVISED_USERS)
-#include "chrome/browser/supervised_user/supervised_user_sync_data_type_controller.h"
-#endif
 
 using bookmarks::BookmarkModel;
 using browser_sync::AutofillDataTypeController;
 using browser_sync::AutofillProfileDataTypeController;
 using browser_sync::BookmarkChangeProcessor;
 using browser_sync::BookmarkDataTypeController;
 using browser_sync::BookmarkModelAssociator;
 using browser_sync::ChromeReportUnrecoverableError;
-#if defined(ENABLE_EXTENSIONS)
-using browser_sync::ExtensionDataTypeController;
-using browser_sync::ExtensionSettingDataTypeController;
-#endif
 using browser_sync::HistoryDeleteDirectivesDataTypeController;
 using browser_sync::PasswordDataTypeController;
-using browser_sync::SearchEngineDataTypeController;
 using browser_sync::SessionDataTypeController;
 using browser_sync::SyncBackendHost;
-using browser_sync::ThemeDataTypeController;
 using browser_sync::TypedUrlChangeProcessor;
 using browser_sync::TypedUrlDataTypeController;
 using browser_sync::TypedUrlModelAssociator;
-using content::BrowserThread;
 using sync_driver::DataTypeController;
 using sync_driver::DataTypeErrorHandler;
 using sync_driver::DataTypeManager;
 using sync_driver::DataTypeManagerImpl;
 using sync_driver::DataTypeManagerObserver;
 using sync_driver::DeviceInfoDataTypeController;
 using sync_driver::ProxyDataTypeController;
 using sync_driver::UIDataTypeController;
 
 namespace {
@@ skipping 20 matching lines @@
 }
 
 syncer::ModelTypeSet GetEnabledTypesFromCommandLine(
     const base::CommandLine& command_line) {
   return syncer::ModelTypeSet();
 }
 
 }  // namespace
 
 ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl(
-    Profile* profile,
-    base::CommandLine* command_line,
+    const RegisterDataTypesMethod& register_platform_types_method,
+    version_info::Channel channel,
+    const std::string& version,
+    bool is_tablet,
+    const base::CommandLine& command_line,
+    const std::string& history_disabled_pref,
     const GURL& sync_service_url,
+    const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread,
+    const scoped_refptr<base::SingleThreadTaskRunner>& db_thread,
     OAuth2TokenService* token_service,
     net::URLRequestContextGetter* url_request_context_getter)
-    : profile_(profile),
+    : register_platform_types_method_(register_platform_types_method),
+      channel_(channel),
+      version_(version),
+      is_tablet_(is_tablet),
       command_line_(command_line),
+      history_disabled_pref_(history_disabled_pref),
       sync_service_url_(sync_service_url),
+      ui_thread_(ui_thread),
+      db_thread_(db_thread),
       token_service_(token_service),
       url_request_context_getter_(url_request_context_getter),
       weak_factory_(this) {
   DCHECK(token_service_);
   DCHECK(url_request_context_getter_);
 }
 
 ProfileSyncComponentsFactoryImpl::~ProfileSyncComponentsFactoryImpl() {
 }
 
 void ProfileSyncComponentsFactoryImpl::RegisterDataTypes(
     sync_driver::SyncClient* sync_client) {
   syncer::ModelTypeSet disabled_types =
-      GetDisabledTypesFromCommandLine(*command_line_);
+      GetDisabledTypesFromCommandLine(command_line_);
   syncer::ModelTypeSet enabled_types =
-      GetEnabledTypesFromCommandLine(*command_line_);
+      GetEnabledTypesFromCommandLine(command_line_);
   RegisterCommonDataTypes(disabled_types, enabled_types, sync_client);
-#if !defined(OS_ANDROID)
-  RegisterDesktopDataTypes(disabled_types, enabled_types, sync_client);
-#endif
+  if (!register_platform_types_method_.is_null()) {
+    register_platform_types_method_.Run(disabled_types, enabled_types,
+                                        sync_client);
+  }
 }
 
 void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
     syncer::ModelTypeSet disabled_types,
     syncer::ModelTypeSet enabled_types,
     sync_driver::SyncClient* sync_client) {
   sync_driver::SyncService* sync_service = sync_client->GetSyncService();
   base::Closure error_callback =
-      base::Bind(&ChromeReportUnrecoverableError, chrome::GetChannel());
-  const scoped_refptr<base::SingleThreadTaskRunner> ui_thread =
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
-  const scoped_refptr<base::SingleThreadTaskRunner> db_thread =
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB);
+      base::Bind(&ChromeReportUnrecoverableError, channel_);
 
   // TODO(stanisc): can DEVICE_INFO be one of disabled datatypes?
   sync_service->RegisterDataTypeController(new DeviceInfoDataTypeController(
-      ui_thread, error_callback, sync_client,
+      ui_thread_, error_callback, sync_client,
       sync_service->GetLocalDeviceInfoProvider()));
 
   // Autofill sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!disabled_types.Has(syncer::AUTOFILL)) {
     sync_service->RegisterDataTypeController(new AutofillDataTypeController(
-        ui_thread, db_thread, error_callback, sync_client));
+        ui_thread_, db_thread_, error_callback, sync_client));
   }
 
   // Autofill profile sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!disabled_types.Has(syncer::AUTOFILL_PROFILE)) {
     sync_service->RegisterDataTypeController(
-        new AutofillProfileDataTypeController(ui_thread, db_thread,
+        new AutofillProfileDataTypeController(ui_thread_, db_thread_,
                                               error_callback, sync_client));
   }
 
   // Wallet data sync is enabled by default, but behind a syncer experiment
   // enforced by the datatype controller. Register unless explicitly disabled.
   bool wallet_disabled = disabled_types.Has(syncer::AUTOFILL_WALLET_DATA);
   if (!wallet_disabled) {
     sync_service->RegisterDataTypeController(
         new browser_sync::AutofillWalletDataTypeController(
-            ui_thread, db_thread, error_callback, sync_client,
+            ui_thread_, db_thread_, error_callback, sync_client,
             syncer::AUTOFILL_WALLET_DATA));
   }
 
   // Wallet metadata sync depends on Wallet data sync. Register if Wallet data
   // is syncing and metadata sync is not explicitly disabled.
   if (!wallet_disabled &&
       !disabled_types.Has(syncer::AUTOFILL_WALLET_METADATA)) {
     sync_service->RegisterDataTypeController(
         new browser_sync::AutofillWalletDataTypeController(
-            ui_thread, db_thread, error_callback, sync_client,
+            ui_thread_, db_thread_, error_callback, sync_client,
             syncer::AUTOFILL_WALLET_METADATA));
   }
 
   // Bookmark sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!disabled_types.Has(syncer::BOOKMARKS)) {
-    sync_service->RegisterDataTypeController(
-        new BookmarkDataTypeController(ui_thread, error_callback, sync_client));
+    sync_service->RegisterDataTypeController(new BookmarkDataTypeController(
+        ui_thread_, error_callback, sync_client));
   }
 
   const bool history_disabled =
-      profile_->GetPrefs()->GetBoolean(prefs::kSavingBrowserHistoryDisabled);
+      sync_client->GetPrefService()->GetBoolean(history_disabled_pref_);
   // TypedUrl sync is enabled by default.  Register unless explicitly disabled,
   // or if saving history is disabled.
   if (!disabled_types.Has(syncer::TYPED_URLS) && !history_disabled) {
     sync_service->RegisterDataTypeController(
-        new TypedUrlDataTypeController(ui_thread, error_callback, sync_client,
-                                       prefs::kSavingBrowserHistoryDisabled));
+        new TypedUrlDataTypeController(ui_thread_, error_callback, sync_client,
+                                       history_disabled_pref_.c_str()));
   }
 
   // Delete directive sync is enabled by default.  Register unless full history
   // sync is disabled.
   if (!disabled_types.Has(syncer::HISTORY_DELETE_DIRECTIVES) &&
       !history_disabled) {
     sync_service->RegisterDataTypeController(
-        new HistoryDeleteDirectivesDataTypeController(ui_thread, error_callback,
-                                                      sync_client));
+        new HistoryDeleteDirectivesDataTypeController(
+            ui_thread_, error_callback, sync_client));
   }
 
   // Session sync is enabled by default.  Register unless explicitly disabled.
   // This is also disabled if the browser history is disabled, because the
   // tab sync data is added to the web history on the server.
   if (!disabled_types.Has(syncer::PROXY_TABS) && !history_disabled) {
     sync_service->RegisterDataTypeController(
-        new ProxyDataTypeController(ui_thread, syncer::PROXY_TABS));
+        new ProxyDataTypeController(ui_thread_, syncer::PROXY_TABS));
     // TODO(zea): remove this once SyncedWindowDelegateGetter is componentized.
     // For now, we know that the implementation of SyncService is always a
     // ProfileSyncService at this level.
     ProfileSyncService* pss = static_cast<ProfileSyncService*>(sync_service);
     sync_service->RegisterDataTypeController(new SessionDataTypeController(
-        ui_thread, error_callback, sync_client,
+        ui_thread_, error_callback, sync_client,
         pss->GetSyncedWindowDelegatesGetter(),
         sync_service->GetLocalDeviceInfoProvider(),
-        prefs::kSavingBrowserHistoryDisabled));
+        history_disabled_pref_.c_str()));
   }
 
   // Favicon sync is enabled by default. Register unless explicitly disabled.
   if (!disabled_types.Has(syncer::FAVICON_IMAGES) &&
       !disabled_types.Has(syncer::FAVICON_TRACKING) &&
       !history_disabled) {
     // crbug/384552. We disable error uploading for this data types for now.
     sync_service->RegisterDataTypeController(new UIDataTypeController(
-        ui_thread, base::Closure(), syncer::FAVICON_IMAGES, sync_client));
+        ui_thread_, base::Closure(), syncer::FAVICON_IMAGES, sync_client));
     sync_service->RegisterDataTypeController(new UIDataTypeController(
-        ui_thread, base::Closure(), syncer::FAVICON_TRACKING, sync_client));
+        ui_thread_, base::Closure(), syncer::FAVICON_TRACKING, sync_client));
   }
 
   // Password sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!disabled_types.Has(syncer::PASSWORDS)) {
     sync_service->RegisterDataTypeController(new PasswordDataTypeController(
-        ui_thread, error_callback, sync_client,
+        ui_thread_, error_callback, sync_client,
         sync_client->GetPasswordStateChangedCallback()));
   }
 
   if (!disabled_types.Has(syncer::PRIORITY_PREFERENCES)) {
     sync_service->RegisterDataTypeController(new UIDataTypeController(
-        ui_thread, error_callback, syncer::PRIORITY_PREFERENCES, sync_client));
+        ui_thread_, error_callback, syncer::PRIORITY_PREFERENCES, sync_client));
   }
 
   // Article sync is disabled by default.  Register only if explicitly enabled.
   if (dom_distiller::IsEnableSyncArticlesSet()) {
     sync_service->RegisterDataTypeController(new UIDataTypeController(
-        ui_thread, error_callback, syncer::ARTICLES, sync_client));
+        ui_thread_, error_callback, syncer::ARTICLES, sync_client));
   }
-
-#if defined(ENABLE_SUPERVISED_USERS)
-  sync_service->RegisterDataTypeController(
-      new SupervisedUserSyncDataTypeController(syncer::SUPERVISED_USER_SETTINGS,
-                                               error_callback, sync_client,
-                                               profile_));
-  sync_service->RegisterDataTypeController(
-      new SupervisedUserSyncDataTypeController(
-          syncer::SUPERVISED_USER_WHITELISTS, error_callback, sync_client,
-          profile_));
-#endif
-}
-
-void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
-    syncer::ModelTypeSet disabled_types,
-    syncer::ModelTypeSet enabled_types,
-    sync_driver::SyncClient* sync_client) {
-  sync_driver::SyncService* sync_service = sync_client->GetSyncService();
-  base::Closure error_callback =
-      base::Bind(&ChromeReportUnrecoverableError, chrome::GetChannel());
-  const scoped_refptr<base::SingleThreadTaskRunner> ui_thread =
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
-
-#if defined(ENABLE_EXTENSIONS)
-  // App sync is enabled by default.  Register unless explicitly
-  // disabled.
-  if (!disabled_types.Has(syncer::APPS)) {
-    sync_service->RegisterDataTypeController(new ExtensionDataTypeController(
-        syncer::APPS, error_callback, sync_client, profile_));
-  }
-
-  // Extension sync is enabled by default.  Register unless explicitly
-  // disabled.
-  if (!disabled_types.Has(syncer::EXTENSIONS)) {
-    sync_service->RegisterDataTypeController(new ExtensionDataTypeController(
-        syncer::EXTENSIONS, error_callback, sync_client, profile_));
-  }
-#endif
-
-  // Preference sync is enabled by default.  Register unless explicitly
-  // disabled.
-  if (!disabled_types.Has(syncer::PREFERENCES)) {
-    sync_service->RegisterDataTypeController(new UIDataTypeController(
-        ui_thread, error_callback, syncer::PREFERENCES, sync_client));
-  }
-
-#if defined(ENABLE_THEMES)
-  // Theme sync is enabled by default.  Register unless explicitly disabled.
-  if (!disabled_types.Has(syncer::THEMES)) {
-    sync_service->RegisterDataTypeController(
-        new ThemeDataTypeController(error_callback, sync_client, profile_));
-  }
-#endif
-
-  // Search Engine sync is enabled by default.  Register unless explicitly
-  // disabled.
-  if (!disabled_types.Has(syncer::SEARCH_ENGINES)) {
-    sync_service->RegisterDataTypeController(new SearchEngineDataTypeController(
-        ui_thread, error_callback, sync_client,
-        TemplateURLServiceFactory::GetForProfile(profile_)));
-  }
-
-#if defined(ENABLE_EXTENSIONS)
-  // Extension setting sync is enabled by default.  Register unless explicitly
-  // disabled.
-  if (!disabled_types.Has(syncer::EXTENSION_SETTINGS)) {
-    sync_service->RegisterDataTypeController(
-        new ExtensionSettingDataTypeController(
-            syncer::EXTENSION_SETTINGS, error_callback, sync_client, profile_));
-  }
-
-  // App setting sync is enabled by default.  Register unless explicitly
-  // disabled.
-  if (!disabled_types.Has(syncer::APP_SETTINGS)) {
-    sync_service->RegisterDataTypeController(
-        new ExtensionSettingDataTypeController(
-            syncer::APP_SETTINGS, error_callback, sync_client, profile_));
-  }
-#endif
-
-#if defined(ENABLE_APP_LIST)
-  if (app_list::switches::IsAppListSyncEnabled()) {
-    sync_service->RegisterDataTypeController(new UIDataTypeController(
-        ui_thread, error_callback, syncer::APP_LIST, sync_client));
-  }
-#endif
-
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
-  // Dictionary sync is enabled by default.
-  if (!disabled_types.Has(syncer::DICTIONARY)) {
-    sync_service->RegisterDataTypeController(new UIDataTypeController(
-        ui_thread, error_callback, syncer::DICTIONARY, sync_client));
-  }
-#endif
-
-#if defined(ENABLE_SUPERVISED_USERS)
-  sync_service->RegisterDataTypeController(
-      new SupervisedUserSyncDataTypeController(
-          syncer::SUPERVISED_USERS, error_callback, sync_client, profile_));
-  sync_service->RegisterDataTypeController(
-      new SupervisedUserSyncDataTypeController(
-          syncer::SUPERVISED_USER_SHARED_SETTINGS, error_callback, sync_client,
-          profile_));
-#endif
-
-#if defined(OS_CHROMEOS)
-  if (command_line_->HasSwitch(switches::kEnableWifiCredentialSync) &&
-      !disabled_types.Has(syncer::WIFI_CREDENTIALS)) {
-    sync_service->RegisterDataTypeController(new UIDataTypeController(
-        ui_thread, error_callback, syncer::WIFI_CREDENTIALS, sync_client));
-  }
-#endif
 }
 
 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager(
     const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&
         debug_info_listener,
     const DataTypeController::TypeMap* controllers,
     const sync_driver::DataTypeEncryptionHandler* encryption_handler,
     SyncBackendHost* backend,
     DataTypeManagerObserver* observer) {
   return new DataTypeManagerImpl(debug_info_listener, controllers,
                                  encryption_handler, backend, observer);
 }
 
 browser_sync::SyncBackendHost*
 ProfileSyncComponentsFactoryImpl::CreateSyncBackendHost(
     const std::string& name,
     sync_driver::SyncClient* sync_client,
     invalidation::InvalidationService* invalidator,
     const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,
     const base::FilePath& sync_folder) {
   return new browser_sync::SyncBackendHostImpl(
-      name, sync_client,
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
-      invalidator, sync_prefs, sync_folder);
+      name, sync_client, ui_thread_, invalidator, sync_prefs, sync_folder);
 }
 
 scoped_ptr<sync_driver::LocalDeviceInfoProvider>
 ProfileSyncComponentsFactoryImpl::CreateLocalDeviceInfoProvider() {
   return scoped_ptr<sync_driver::LocalDeviceInfoProvider>(
       new browser_sync::LocalDeviceInfoProviderImpl(
-          chrome::GetChannel(),
-          chrome::GetVersionString(),
-          ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET));
+          channel_,
+          version_,
+          is_tablet_));
 }
 
 class TokenServiceProvider
     : public OAuth2TokenServiceRequest::TokenServiceProvider {
  public:
   TokenServiceProvider(
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
       OAuth2TokenService* token_service);
 
   // OAuth2TokenServiceRequest::TokenServiceProvider implementation.
@@ skipping 33 matching lines @@
     const std::string& store_birthday,
     syncer::ModelType model_type,
     syncer::AttachmentService::Delegate* delegate) {
   scoped_ptr<syncer::AttachmentUploader> attachment_uploader;
   scoped_ptr<syncer::AttachmentDownloader> attachment_downloader;
   // Only construct an AttachmentUploader and AttachmentDownload if we have sync
   // credentials. We may not have sync credentials because there may not be a
   // signed in sync user (e.g. sync is running in "backup" mode).
   if (!user_share.sync_credentials.email.empty() &&
       !user_share.sync_credentials.scope_set.empty()) {
-    const scoped_refptr<base::SingleThreadTaskRunner> ui_thread =
-        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
-
     scoped_refptr<OAuth2TokenServiceRequest::TokenServiceProvider>
         token_service_provider(
-            new TokenServiceProvider(ui_thread, token_service_));
+            new TokenServiceProvider(ui_thread_, token_service_));
     // TODO(maniscalco): Use shared (one per profile) thread-safe instances of
     // AttachmentUploader and AttachmentDownloader instead of creating a new one
     // per AttachmentService (bug 369536).
     attachment_uploader.reset(new syncer::AttachmentUploaderImpl(
         sync_service_url_, url_request_context_getter_,
         user_share.sync_credentials.email,
         user_share.sync_credentials.scope_set, token_service_provider,
         store_birthday, model_type));
 
     token_service_provider =
-        new TokenServiceProvider(ui_thread, token_service_);
+        new TokenServiceProvider(ui_thread_, token_service_);
     attachment_downloader = syncer::AttachmentDownloader::Create(
         sync_service_url_, url_request_context_getter_,
         user_share.sync_credentials.email,
         user_share.sync_credentials.scope_set, token_service_provider,
         store_birthday, model_type);
   }
 
   // It is important that the initial backoff delay is relatively large.  For
   // whatever reason, the server may fail all requests for a short period of
   // time.  When this happens we don't want to overwhelm the server with
   // requests so we use a large initial backoff.
   const base::TimeDelta initial_backoff_delay =
       base::TimeDelta::FromMinutes(30);
   const base::TimeDelta max_backoff_delay = base::TimeDelta::FromHours(4);
   scoped_ptr<syncer::AttachmentService> attachment_service(
       new syncer::AttachmentServiceImpl(
           attachment_store.Pass(), attachment_uploader.Pass(),
           attachment_downloader.Pass(), delegate, initial_backoff_delay,
           max_backoff_delay));
   return attachment_service.Pass();
 }
 
 sync_driver::SyncApiComponentFactory::SyncComponents
     ProfileSyncComponentsFactoryImpl::CreateBookmarkSyncComponents(
         sync_driver::SyncService* sync_service,
         sync_driver::DataTypeErrorHandler* error_handler) {
   BookmarkModel* bookmark_model =
-      BookmarkModelFactory::GetForProfile(profile_);
+      sync_service->GetSyncClient()->GetBookmarkModel();
   syncer::UserShare* user_share = sync_service->GetUserShare();
   // TODO(akalin): We may want to propagate this switch up eventually.
 #if defined(OS_ANDROID)

[blundell, 2015/11/10 15:24:24]

Could you add || defined(OS_IOS) here?

[Nicolas Zea, 2015/11/11 00:06:20]

Done.

   const bool kExpectMobileBookmarksFolder = true;
 #else
   const bool kExpectMobileBookmarksFolder = false;
 #endif
   BookmarkModelAssociator* model_associator = new BookmarkModelAssociator(
       bookmark_model, sync_service->GetSyncClient(), user_share, error_handler,
       kExpectMobileBookmarksFolder);
   BookmarkChangeProcessor* change_processor = new BookmarkChangeProcessor(
       sync_service->GetSyncClient(), model_associator, error_handler);
   return SyncComponents(model_associator, change_processor);
 }
 
 sync_driver::SyncApiComponentFactory::SyncComponents
     ProfileSyncComponentsFactoryImpl::CreateTypedUrlSyncComponents(
         sync_driver::SyncService* sync_service,
         history::HistoryBackend* history_backend,
         sync_driver::DataTypeErrorHandler* error_handler) {
-  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));

[blundell, 2015/11/10 15:24:24]

nit: Why not keep this DCHECK?

[Nicolas Zea, 2015/11/11 00:06:20]

Done.

-
-  const scoped_refptr<base::SingleThreadTaskRunner> ui_thread =
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
-
   // TODO(zea): Once TypedURLs are converted to SyncableService, remove
   // |sync_service_| member, and make GetSyncService require it be called on
   // the UI thread.
   TypedUrlModelAssociator* model_associator =
       new TypedUrlModelAssociator(sync_service,
                                   history_backend,
                                   error_handler);
   TypedUrlChangeProcessor* change_processor = new TypedUrlChangeProcessor(
-      model_associator, history_backend, error_handler, ui_thread);
+      model_associator, history_backend, error_handler, ui_thread_);
   return SyncComponents(model_associator, change_processor);
 }