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

Unified Diff: components/browser_sync/profile_sync_components_factory_impl.cc

Issue 2376123003: [Sync] Move //components/sync to the syncer namespace. (Closed)
Patch Set: Fix tools and iOS. Created 4 years, 3 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
Index: components/browser_sync/profile_sync_components_factory_impl.cc
diff --git a/components/browser_sync/profile_sync_components_factory_impl.cc b/components/browser_sync/profile_sync_components_factory_impl.cc
index 0f550ac9eb70b6e94cfa1a397d3c24b77b5f0e86..16db6f18e06cf192c44ca84267e820226ccb81d2 100644
--- a/components/browser_sync/profile_sync_components_factory_impl.cc
+++ b/components/browser_sync/profile_sync_components_factory_impl.cc
@@ -53,14 +53,14 @@ using bookmarks::BookmarkModel;
using sync_bookmarks::BookmarkChangeProcessor;
using sync_bookmarks::BookmarkDataTypeController;
using sync_bookmarks::BookmarkModelAssociator;
-using sync_driver::DataTypeController;
-using sync_driver::DataTypeManager;
-using sync_driver::DataTypeManagerImpl;
-using sync_driver::DataTypeManagerObserver;
-using sync_driver::DeviceInfoDataTypeController;
-using sync_driver::ProxyDataTypeController;
-using sync_driver::UIDataTypeController;
-using sync_driver_v2::UIModelTypeController;
+using syncer::DataTypeController;
+using syncer::DataTypeManager;
+using syncer::DataTypeManagerImpl;
+using syncer::DataTypeManagerObserver;
+using syncer::DeviceInfoDataTypeController;
+using syncer::ProxyDataTypeController;
+using syncer::UIDataTypeController;
+using syncer::UIModelTypeController;
using sync_sessions::SessionDataTypeController;
namespace browser_sync {
@@ -92,7 +92,7 @@ const base::Feature kSyncPreferencesFeature{"SyncPreferences",
} // namespace
ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl(
- sync_driver::SyncClient* sync_client,
+ syncer::SyncClient* sync_client,
version_info::Channel channel,
const std::string& version,
bool is_tablet,
@@ -126,7 +126,7 @@ ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl(
ProfileSyncComponentsFactoryImpl::~ProfileSyncComponentsFactoryImpl() {}
void ProfileSyncComponentsFactoryImpl::RegisterDataTypes(
- sync_driver::SyncService* sync_service,
+ syncer::SyncService* sync_service,
const RegisterDataTypesMethod& register_platform_types_method) {
syncer::ModelTypeSet disabled_types =
GetDisabledTypesFromCommandLine(command_line_);
@@ -139,11 +139,11 @@ void ProfileSyncComponentsFactoryImpl::RegisterDataTypes(
}
void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
- sync_driver::SyncService* sync_service,
+ syncer::SyncService* sync_service,
syncer::ModelTypeSet disabled_types,
syncer::ModelTypeSet enabled_types) {
base::Closure error_callback =
- base::Bind(&ChromeReportUnrecoverableError, channel_);
+ base::Bind(&syncer::ChromeReportUnrecoverableError, channel_);
// TODO(stanisc): can DEVICE_INFO be one of disabled datatypes?
if (base::FeatureList::IsEnabled(switches::kSyncUSSDeviceInfo)) {
@@ -288,26 +288,27 @@ DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager(
const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&
debug_info_listener,
const DataTypeController::TypeMap* controllers,
- const sync_driver::DataTypeEncryptionHandler* encryption_handler,
- SyncBackendHost* backend,
+ const syncer::DataTypeEncryptionHandler* encryption_handler,
+ syncer::SyncBackendHost* backend,
DataTypeManagerObserver* observer) {
return new DataTypeManagerImpl(debug_info_listener, controllers,
encryption_handler, backend, observer);
}
-SyncBackendHost* ProfileSyncComponentsFactoryImpl::CreateSyncBackendHost(
+syncer::SyncBackendHost*
+ProfileSyncComponentsFactoryImpl::CreateSyncBackendHost(
const std::string& name,
invalidation::InvalidationService* invalidator,
- const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,
+ const base::WeakPtr<syncer::SyncPrefs>& sync_prefs,
const base::FilePath& sync_folder) {
- return new SyncBackendHostImpl(name, sync_client_, ui_thread_, invalidator,
- sync_prefs, sync_folder);
+ return new syncer::SyncBackendHostImpl(name, sync_client_, ui_thread_,
+ invalidator, sync_prefs, sync_folder);
}
-std::unique_ptr<sync_driver::LocalDeviceInfoProvider>
+std::unique_ptr<syncer::LocalDeviceInfoProvider>
ProfileSyncComponentsFactoryImpl::CreateLocalDeviceInfoProvider() {
- return base::MakeUnique<LocalDeviceInfoProviderImpl>(channel_, version_,
- is_tablet_);
+ return base::MakeUnique<syncer::LocalDeviceInfoProviderImpl>(
+ channel_, version_, is_tablet_);
}
class TokenServiceProvider
@@ -395,9 +396,9 @@ ProfileSyncComponentsFactoryImpl::CreateAttachmentService(
return attachment_service;
}
-sync_driver::SyncApiComponentFactory::SyncComponents
+syncer::SyncApiComponentFactory::SyncComponents
ProfileSyncComponentsFactoryImpl::CreateBookmarkSyncComponents(
- sync_driver::SyncService* sync_service,
+ syncer::SyncService* sync_service,
std::unique_ptr<syncer::DataTypeErrorHandler> error_handler) {
BookmarkModel* bookmark_model =
sync_service->GetSyncClient()->GetBookmarkModel();

Powered by Google App Engine
This is Rietveld 408576698