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

Unified Diff: components/browser_sync/profile_sync_components_factory_impl.cc

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Address comments. 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 731d726a440a1151e9738e57ff61fcde616e0a87..d8f48377b75fa03c870c7fb4c8e71008c4e9d6b3 100644
--- a/components/browser_sync/profile_sync_components_factory_impl.cc
+++ b/components/browser_sync/profile_sync_components_factory_impl.cc
@@ -49,13 +49,6 @@
#include "net/url_request/url_request_context_getter.h"
using bookmarks::BookmarkModel;
-using browser_sync::AutofillDataTypeController;
-using browser_sync::AutofillProfileDataTypeController;
-using browser_sync::ChromeReportUnrecoverableError;
-using browser_sync::HistoryDeleteDirectivesDataTypeController;
-using browser_sync::PasswordDataTypeController;
-using browser_sync::SyncBackendHost;
-using browser_sync::TypedUrlDataTypeController;
using sync_bookmarks::BookmarkChangeProcessor;
using sync_bookmarks::BookmarkDataTypeController;
using sync_bookmarks::BookmarkModelAssociator;
@@ -69,6 +62,8 @@ using sync_driver::UIDataTypeController;
using sync_driver_v2::UIModelTypeController;
using sync_sessions::SessionDataTypeController;
+namespace browser_sync {
+
namespace {
syncer::ModelTypeSet GetDisabledTypesFromCommandLine(
@@ -182,7 +177,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
bool wallet_disabled = disabled_types.Has(syncer::AUTOFILL_WALLET_DATA);
if (!wallet_disabled) {
sync_service->RegisterDataTypeController(
- base::MakeUnique<browser_sync::AutofillWalletDataTypeController>(
+ base::MakeUnique<AutofillWalletDataTypeController>(
syncer::AUTOFILL_WALLET_DATA, db_thread_, error_callback,
sync_client_, web_data_service_));
}
@@ -192,7 +187,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
if (!wallet_disabled &&
!disabled_types.Has(syncer::AUTOFILL_WALLET_METADATA)) {
sync_service->RegisterDataTypeController(
- base::MakeUnique<browser_sync::AutofillWalletDataTypeController>(
+ base::MakeUnique<AutofillWalletDataTypeController>(
syncer::AUTOFILL_WALLET_METADATA, db_thread_, error_callback,
sync_client_, web_data_service_));
}
@@ -296,20 +291,19 @@ DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager(
encryption_handler, backend, observer);
}
-browser_sync::SyncBackendHost*
-ProfileSyncComponentsFactoryImpl::CreateSyncBackendHost(
+SyncBackendHost* ProfileSyncComponentsFactoryImpl::CreateSyncBackendHost(
const std::string& name,
invalidation::InvalidationService* invalidator,
const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,
const base::FilePath& sync_folder) {
- return new browser_sync::SyncBackendHostImpl(
- name, sync_client_, ui_thread_, invalidator, sync_prefs, sync_folder);
+ return new SyncBackendHostImpl(name, sync_client_, ui_thread_, invalidator,
+ sync_prefs, sync_folder);
}
std::unique_ptr<sync_driver::LocalDeviceInfoProvider>
ProfileSyncComponentsFactoryImpl::CreateLocalDeviceInfoProvider() {
- return base::MakeUnique<browser_sync::LocalDeviceInfoProviderImpl>(
- channel_, version_, is_tablet_);
+ return base::MakeUnique<LocalDeviceInfoProviderImpl>(channel_, version_,
+ is_tablet_);
}
class TokenServiceProvider
@@ -426,3 +420,5 @@ void ProfileSyncComponentsFactoryImpl::OverridePrefsForUssTest(bool use_uss) {
bool ProfileSyncComponentsFactoryImpl::
override_prefs_controller_to_uss_for_test_ = false;
+
+} // namespace browser_sync
« no previous file with comments | « components/browser_sync/profile_sync_components_factory_impl.h ('k') | components/browser_sync/profile_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698