Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2761)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/profile_sync_components_factory_impl.cc

Issue 1310553005: [Sync] Replace ProfileSyncComponentsFactory with SyncClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Really fix GN Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/profile_sync_components_factory_impl.h ('k') | chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_components_factory_impl.cc
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index 6deaa82214edc8a3a43f8fe08e58f7d31ad17c67..88aef34d14c76015ef276a015bd74fb8aee19a85 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -5,18 +5,10 @@
#include "chrome/browser/sync/profile_sync_components_factory_impl.h"
#include "base/command_line.h"
+#include "base/prefs/pref_service.h"
#include "build/build_config.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
-#include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/password_manager/password_store_factory.h"
-#include "chrome/browser/pref_service_flags_storage.h"
-#include "chrome/browser/prefs/pref_model_associator.h"
-#include "chrome/browser/prefs/pref_service_syncable.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/browser/signin/signin_manager_factory.h"
-#include "chrome/browser/sync/chrome_sync_client.h"
#include "chrome/browser/sync/glue/autofill_data_type_controller.h"
#include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h"
#include "chrome/browser/sync/glue/autofill_wallet_data_type_controller.h"
@@ -34,78 +26,37 @@
#include "chrome/browser/sync/glue/typed_url_change_processor.h"
#include "chrome/browser/sync/glue/typed_url_data_type_controller.h"
#include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/browser/sync/sessions/session_data_type_controller.h"
-#include "chrome/browser/themes/theme_service.h"
-#include "chrome/browser/themes/theme_service_factory.h"
-#include "chrome/browser/themes/theme_syncable_service.h"
-#include "chrome/browser/web_data_service_factory.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
-#include "components/autofill/core/browser/webdata/autocomplete_syncable_service.h"
-#include "components/autofill/core/browser/webdata/autofill_profile_syncable_service.h"
-#include "components/autofill/core/browser/webdata/autofill_wallet_metadata_syncable_service.h"
-#include "components/autofill/core/browser/webdata/autofill_wallet_syncable_service.h"
-#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
#include "components/autofill/core/common/autofill_pref_names.h"
#include "components/autofill/core/common/autofill_switches.h"
#include "components/dom_distiller/core/dom_distiller_features.h"
-#include "components/dom_distiller/core/dom_distiller_service.h"
-#include "components/history/core/browser/history_service.h"
-#include "components/password_manager/core/browser/password_store.h"
-#include "components/search_engines/template_url_service.h"
-#include "components/signin/core/browser/signin_manager.h"
#include "components/sync_driver/data_type_manager_impl.h"
-#include "components/sync_driver/data_type_manager_observer.h"
#include "components/sync_driver/device_info_data_type_controller.h"
-#include "components/sync_driver/generic_change_processor.h"
#include "components/sync_driver/glue/typed_url_model_associator.h"
#include "components/sync_driver/proxy_data_type_controller.h"
-#include "components/sync_driver/shared_change_processor.h"
#include "components/sync_driver/ui_data_type_controller.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/api/syncable_service.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"
#if defined(ENABLE_APP_LIST)
-#include "chrome/browser/ui/app_list/app_list_syncable_service.h"
-#include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
#include "ui/app_list/app_list_switches.h"
#endif
#if defined(ENABLE_EXTENSIONS)
-#include "chrome/browser/extensions/api/storage/settings_sync_util.h"
-#include "chrome/browser/extensions/extension_sync_service.h"
#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/legacy/supervised_user_shared_settings_service.h"
-#include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_factory.h"
-#include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h"
-#include "chrome/browser/supervised_user/legacy/supervised_user_sync_service_factory.h"
-#include "chrome/browser/supervised_user/supervised_user_service.h"
-#include "chrome/browser/supervised_user/supervised_user_service_factory.h"
-#include "chrome/browser/supervised_user/supervised_user_settings_service.h"
-#include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"
#include "chrome/browser/supervised_user/supervised_user_sync_data_type_controller.h"
-#include "chrome/browser/supervised_user/supervised_user_whitelist_service.h"
-#endif
-
-#if defined(ENABLE_SPELLCHECK)
-#include "chrome/browser/spellchecker/spellcheck_factory.h"
-#include "chrome/browser/spellchecker/spellcheck_service.h"
-#endif
-
-#if defined(OS_CHROMEOS)
-#include "components/wifi_sync/wifi_credential_syncable_service.h"
-#include "components/wifi_sync/wifi_credential_syncable_service_factory.h"
#endif
using bookmarks::BookmarkModel;
@@ -136,7 +87,6 @@ using sync_driver::DataTypeManagerImpl;
using sync_driver::DataTypeManagerObserver;
using sync_driver::DeviceInfoDataTypeController;
using sync_driver::ProxyDataTypeController;
-using sync_driver::SharedChangeProcessor;
using sync_driver::UIDataTypeController;
namespace {
@@ -181,9 +131,6 @@ ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl(
net::URLRequestContextGetter* url_request_context_getter)
: profile_(profile),
command_line_(command_line),
- web_data_service_(WebDataServiceFactory::GetAutofillWebDataForProfile(
- profile_,
- ServiceAccessType::EXPLICIT_ACCESS)),
sync_service_url_(sync_service_url),
token_service_(token_service),
url_request_context_getter_(url_request_context_getter),
@@ -196,66 +143,71 @@ ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl(
ProfileSyncComponentsFactoryImpl::~ProfileSyncComponentsFactoryImpl() {
}
-void ProfileSyncComponentsFactoryImpl::RegisterDataTypes(
- ProfileSyncService* pss) {
+void ProfileSyncComponentsFactoryImpl::Initialize(
+ sync_driver::SyncService* sync_service) {
+ chrome_sync_client_.Initialize(sync_service);
+}
+
+void ProfileSyncComponentsFactoryImpl::RegisterDataTypes() {
syncer::ModelTypeSet disabled_types =
GetDisabledTypesFromCommandLine(*command_line_);
syncer::ModelTypeSet enabled_types =
GetEnabledTypesFromCommandLine(*command_line_);
- RegisterCommonDataTypes(disabled_types, enabled_types, pss);
+ RegisterCommonDataTypes(disabled_types, enabled_types);
#if !defined(OS_ANDROID)
- RegisterDesktopDataTypes(disabled_types, enabled_types, pss);
+ RegisterDesktopDataTypes(disabled_types, enabled_types);
#endif
}
void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
syncer::ModelTypeSet disabled_types,
- syncer::ModelTypeSet enabled_types,
- ProfileSyncService* pss) {
+ syncer::ModelTypeSet enabled_types) {
+ sync_driver::SyncService* sync_service = chrome_sync_client_.GetSyncService();
+
// TODO(stanisc): can DEVICE_INFO be one of disabled datatypes?
- pss->RegisterDataTypeController(new DeviceInfoDataTypeController(
+ sync_service->RegisterDataTypeController(new DeviceInfoDataTypeController(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
base::Bind(&ChromeReportUnrecoverableError),
&chrome_sync_client_,
- pss->GetLocalDeviceInfoProvider()));
+ sync_service->GetLocalDeviceInfoProvider()));
// Autofill sync is enabled by default. Register unless explicitly
// disabled.
if (!disabled_types.Has(syncer::AUTOFILL)) {
- pss->RegisterDataTypeController(
- new AutofillDataTypeController(&chrome_sync_client_, profile_));
+ sync_service->RegisterDataTypeController(
+ new AutofillDataTypeController(&chrome_sync_client_));
}
// Autofill profile sync is enabled by default. Register unless explicitly
// disabled.
if (!disabled_types.Has(syncer::AUTOFILL_PROFILE)) {
- pss->RegisterDataTypeController(
- new AutofillProfileDataTypeController(&chrome_sync_client_, profile_));
+ sync_service->RegisterDataTypeController(
+ new AutofillProfileDataTypeController(&chrome_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) {
- pss->RegisterDataTypeController(
+ sync_service->RegisterDataTypeController(
new browser_sync::AutofillWalletDataTypeController(
- &chrome_sync_client_, profile_, syncer::AUTOFILL_WALLET_DATA));
+ &chrome_sync_client_, syncer::AUTOFILL_WALLET_DATA));
}
// Wallet metadata sync depends on Wallet data sync and is disabled by
// default. Register if Wallet data is syncing and metadata sync is explicitly
// enabled.
if (!wallet_disabled && enabled_types.Has(syncer::AUTOFILL_WALLET_METADATA)) {
- pss->RegisterDataTypeController(
+ sync_service->RegisterDataTypeController(
new browser_sync::AutofillWalletDataTypeController(
- &chrome_sync_client_, profile_, syncer::AUTOFILL_WALLET_METADATA));
+ &chrome_sync_client_, syncer::AUTOFILL_WALLET_METADATA));
}
// Bookmark sync is enabled by default. Register unless explicitly
// disabled.
if (!disabled_types.Has(syncer::BOOKMARKS)) {
- pss->RegisterDataTypeController(
- new BookmarkDataTypeController(&chrome_sync_client_, profile_, pss));
+ sync_service->RegisterDataTypeController(
+ new BookmarkDataTypeController(&chrome_sync_client_));
}
const bool history_disabled =
@@ -263,31 +215,32 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
// 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) {
- pss->RegisterDataTypeController(
- new TypedUrlDataTypeController(&chrome_sync_client_, profile_, pss));
+ sync_service->RegisterDataTypeController(
+ new TypedUrlDataTypeController(&chrome_sync_client_));
}
// Delete directive sync is enabled by default. Register unless full history
// sync is disabled.
if (!disabled_types.Has(syncer::HISTORY_DELETE_DIRECTIVES) &&
!history_disabled) {
- pss->RegisterDataTypeController(
- new HistoryDeleteDirectivesDataTypeController(&chrome_sync_client_,
- pss));
+ sync_service->RegisterDataTypeController(
+ new HistoryDeleteDirectivesDataTypeController(&chrome_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) {
- pss->RegisterDataTypeController(new ProxyDataTypeController(
+ sync_service->RegisterDataTypeController(new ProxyDataTypeController(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
syncer::PROXY_TABS));
- pss->RegisterDataTypeController(
- new SessionDataTypeController(&chrome_sync_client_,
- profile_,
- pss->GetSyncedWindowDelegatesGetter(),
- pss->GetLocalDeviceInfoProvider()));
+ // 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(
+ &chrome_sync_client_, profile_, pss->GetSyncedWindowDelegatesGetter(),
+ sync_service->GetLocalDeviceInfoProvider()));
}
// Favicon sync is enabled by default. Register unless explicitly disabled.
@@ -295,13 +248,13 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
!disabled_types.Has(syncer::FAVICON_TRACKING) &&
!history_disabled) {
// crbug/384552. We disable error uploading for this data types for now.
- pss->RegisterDataTypeController(
+ sync_service->RegisterDataTypeController(
new UIDataTypeController(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
base::Closure(),
syncer::FAVICON_IMAGES,
&chrome_sync_client_));
- pss->RegisterDataTypeController(
+ sync_service->RegisterDataTypeController(
new UIDataTypeController(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
base::Closure(),
@@ -312,12 +265,12 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
// Password sync is enabled by default. Register unless explicitly
// disabled.
if (!disabled_types.Has(syncer::PASSWORDS)) {
- pss->RegisterDataTypeController(
+ sync_service->RegisterDataTypeController(
new PasswordDataTypeController(&chrome_sync_client_, profile_));
}
if (!disabled_types.Has(syncer::PRIORITY_PREFERENCES)) {
- pss->RegisterDataTypeController(
+ sync_service->RegisterDataTypeController(
new UIDataTypeController(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
base::Bind(&ChromeReportUnrecoverableError),
@@ -327,7 +280,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
// Article sync is disabled by default. Register only if explicitly enabled.
if (dom_distiller::IsEnableSyncArticlesSet()) {
- pss->RegisterDataTypeController(
+ sync_service->RegisterDataTypeController(
new UIDataTypeController(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
base::Bind(&ChromeReportUnrecoverableError),
@@ -336,35 +289,36 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
}
#if defined(ENABLE_SUPERVISED_USERS)
- pss->RegisterDataTypeController(
+ sync_service->RegisterDataTypeController(
new SupervisedUserSyncDataTypeController(
syncer::SUPERVISED_USER_SETTINGS,
- this,
+ &chrome_sync_client_,
profile_));
- pss->RegisterDataTypeController(
+ sync_service->RegisterDataTypeController(
new SupervisedUserSyncDataTypeController(
syncer::SUPERVISED_USER_WHITELISTS,
- this,
+ &chrome_sync_client_,
profile_));
#endif
}
void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
syncer::ModelTypeSet disabled_types,
- syncer::ModelTypeSet enabled_types,
- ProfileSyncService* pss) {
+ syncer::ModelTypeSet enabled_types) {
+ sync_driver::SyncService* sync_service = chrome_sync_client_.GetSyncService();
+
#if defined(ENABLE_EXTENSIONS)
// App sync is enabled by default. Register unless explicitly
// disabled.
if (!disabled_types.Has(syncer::APPS)) {
- pss->RegisterDataTypeController(new ExtensionDataTypeController(
+ sync_service->RegisterDataTypeController(new ExtensionDataTypeController(
syncer::APPS, &chrome_sync_client_, profile_));
}
// Extension sync is enabled by default. Register unless explicitly
// disabled.
if (!disabled_types.Has(syncer::EXTENSIONS)) {
- pss->RegisterDataTypeController(new ExtensionDataTypeController(
+ sync_service->RegisterDataTypeController(new ExtensionDataTypeController(
syncer::EXTENSIONS, &chrome_sync_client_, profile_));
}
#endif
@@ -372,7 +326,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
// Preference sync is enabled by default. Register unless explicitly
// disabled.
if (!disabled_types.Has(syncer::PREFERENCES)) {
- pss->RegisterDataTypeController(
+ sync_service->RegisterDataTypeController(
new UIDataTypeController(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
base::Bind(&ChromeReportUnrecoverableError),
@@ -383,7 +337,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
#if defined(ENABLE_THEMES)
// Theme sync is enabled by default. Register unless explicitly disabled.
if (!disabled_types.Has(syncer::THEMES)) {
- pss->RegisterDataTypeController(
+ sync_service->RegisterDataTypeController(
new ThemeDataTypeController(&chrome_sync_client_, profile_));
}
#endif
@@ -391,7 +345,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
// Search Engine sync is enabled by default. Register unless explicitly
// disabled.
if (!disabled_types.Has(syncer::SEARCH_ENGINES)) {
- pss->RegisterDataTypeController(
+ sync_service->RegisterDataTypeController(
new SearchEngineDataTypeController(&chrome_sync_client_, profile_));
}
@@ -399,21 +353,23 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
// Extension setting sync is enabled by default. Register unless explicitly
// disabled.
if (!disabled_types.Has(syncer::EXTENSION_SETTINGS)) {
- pss->RegisterDataTypeController(new ExtensionSettingDataTypeController(
- syncer::EXTENSION_SETTINGS, &chrome_sync_client_, profile_));
+ sync_service->RegisterDataTypeController(
+ new ExtensionSettingDataTypeController(syncer::EXTENSION_SETTINGS,
+ &chrome_sync_client_, profile_));
}
// App setting sync is enabled by default. Register unless explicitly
// disabled.
if (!disabled_types.Has(syncer::APP_SETTINGS)) {
- pss->RegisterDataTypeController(new ExtensionSettingDataTypeController(
- syncer::APP_SETTINGS, &chrome_sync_client_, profile_));
+ sync_service->RegisterDataTypeController(
+ new ExtensionSettingDataTypeController(syncer::APP_SETTINGS,
+ &chrome_sync_client_, profile_));
}
#endif
#if defined(ENABLE_APP_LIST)
if (app_list::switches::IsAppListSyncEnabled()) {
- pss->RegisterDataTypeController(
+ sync_service->RegisterDataTypeController(
new UIDataTypeController(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
base::Bind(&ChromeReportUnrecoverableError),
@@ -425,7 +381,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
// Dictionary sync is enabled by default.
if (!disabled_types.Has(syncer::DICTIONARY)) {
- pss->RegisterDataTypeController(
+ sync_service->RegisterDataTypeController(
new UIDataTypeController(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
base::Bind(&ChromeReportUnrecoverableError),
@@ -435,22 +391,22 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
#endif
#if defined(ENABLE_SUPERVISED_USERS)
- pss->RegisterDataTypeController(
+ sync_service->RegisterDataTypeController(
new SupervisedUserSyncDataTypeController(
syncer::SUPERVISED_USERS,
- this,
+ &chrome_sync_client_,
profile_));
- pss->RegisterDataTypeController(
+ sync_service->RegisterDataTypeController(
new SupervisedUserSyncDataTypeController(
syncer::SUPERVISED_USER_SHARED_SETTINGS,
- this,
+ &chrome_sync_client_,
profile_));
#endif
#if defined(OS_CHROMEOS)
if (command_line_->HasSwitch(switches::kEnableWifiCredentialSync) &&
!disabled_types.Has(syncer::WIFI_CREDENTIALS)) {
- pss->RegisterDataTypeController(
+ sync_service->RegisterDataTypeController(
new UIDataTypeController(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
base::Bind(&ChromeReportUnrecoverableError),
@@ -478,11 +434,10 @@ DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager(
browser_sync::SyncBackendHost*
ProfileSyncComponentsFactoryImpl::CreateSyncBackendHost(
const std::string& name,
- Profile* profile,
invalidation::InvalidationService* invalidator,
const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,
const base::FilePath& sync_folder) {
- return new browser_sync::SyncBackendHostImpl(name, profile, invalidator,
+ return new browser_sync::SyncBackendHostImpl(name, profile_, invalidator,
sync_prefs, sync_folder);
}
@@ -529,12 +484,6 @@ OAuth2TokenService* TokenServiceProvider::GetTokenService() {
return token_service_;
}
-base::WeakPtr<syncer::SyncableService>
-ProfileSyncComponentsFactoryImpl::GetSyncableServiceForType(
- syncer::ModelType type) {
- return chrome_sync_client_.GetSyncableServiceForType(type);
-}
-
scoped_ptr<syncer::AttachmentService>
ProfileSyncComponentsFactoryImpl::CreateAttachmentService(
scoped_ptr<syncer::AttachmentStoreForSync> attachment_store,
@@ -589,13 +538,13 @@ ProfileSyncComponentsFactoryImpl::CreateAttachmentService(
return attachment_service.Pass();
}
-ProfileSyncComponentsFactory::SyncComponents
+sync_driver::SyncApiComponentFactory::SyncComponents
ProfileSyncComponentsFactoryImpl::CreateBookmarkSyncComponents(
- ProfileSyncService* profile_sync_service,
+ sync_driver::SyncService* sync_service,
sync_driver::DataTypeErrorHandler* error_handler) {
BookmarkModel* bookmark_model =
- BookmarkModelFactory::GetForProfile(profile_sync_service->profile());
- syncer::UserShare* user_share = profile_sync_service->GetUserShare();
+ BookmarkModelFactory::GetForProfile(profile_);
+ syncer::UserShare* user_share = sync_service->GetUserShare();
// TODO(akalin): We may want to propagate this switch up eventually.
#if defined(OS_ANDROID)
const bool kExpectMobileBookmarksFolder = true;
@@ -604,24 +553,27 @@ ProfileSyncComponentsFactory::SyncComponents
#endif
BookmarkModelAssociator* model_associator =
new BookmarkModelAssociator(bookmark_model,
- profile_sync_service->profile(),
+ profile_,
user_share,
error_handler,
kExpectMobileBookmarksFolder);
BookmarkChangeProcessor* change_processor =
- new BookmarkChangeProcessor(profile_sync_service->profile(),
+ new BookmarkChangeProcessor(profile_,
model_associator,
error_handler);
return SyncComponents(model_associator, change_processor);
}
-ProfileSyncComponentsFactory::SyncComponents
+sync_driver::SyncApiComponentFactory::SyncComponents
ProfileSyncComponentsFactoryImpl::CreateTypedUrlSyncComponents(
- ProfileSyncService* profile_sync_service,
+ sync_driver::SyncService* sync_service,
history::HistoryBackend* history_backend,
sync_driver::DataTypeErrorHandler* error_handler) {
+ // 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(profile_sync_service,
+ new TypedUrlModelAssociator(sync_service,
history_backend,
error_handler);
TypedUrlChangeProcessor* change_processor =
« no previous file with comments | « chrome/browser/sync/profile_sync_components_factory_impl.h ('k') | chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698