[Sync] Fix namespaces for the browser_sync component.

components/browser_sync/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 "components/browser_sync/profile_sync_components_factory_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 31 matching lines @@
 #include "components/sync/driver/ui_model_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_sessions/session_data_type_controller.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"
 
 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;
 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 sync_sessions::SessionDataTypeController;
 
+namespace browser_sync {
+
 namespace {
 
 syncer::ModelTypeSet GetDisabledTypesFromCommandLine(
     const base::CommandLine& command_line) {
   syncer::ModelTypeSet disabled_types;
   std::string disabled_types_str =
       command_line.GetSwitchValueASCII(switches::kDisableSyncTypes);
 
   disabled_types = syncer::ModelTypeSetFromString(disabled_types_str);
   return disabled_types;
@@ skipping 93 matching lines @@
     sync_service->RegisterDataTypeController(
         base::MakeUnique<AutofillProfileDataTypeController>(
             db_thread_, error_callback, sync_client_, web_data_service_));
   }
 
   // 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(
-        base::MakeUnique<browser_sync::AutofillWalletDataTypeController>(
+        base::MakeUnique<AutofillWalletDataTypeController>(
             syncer::AUTOFILL_WALLET_DATA, db_thread_, error_callback,
             sync_client_, web_data_service_));
   }
 
   // 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(
-        base::MakeUnique<browser_sync::AutofillWalletDataTypeController>(
+        base::MakeUnique<AutofillWalletDataTypeController>(
             syncer::AUTOFILL_WALLET_METADATA, db_thread_, error_callback,
             sync_client_, web_data_service_));
   }
 
   // Bookmark sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!disabled_types.Has(syncer::BOOKMARKS)) {
     sync_service->RegisterDataTypeController(
         base::MakeUnique<BookmarkDataTypeController>(error_callback,
                                                      sync_client_));
@@ skipping 83 matching lines @@
     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(
+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
     : public OAuth2TokenServiceRequest::TokenServiceProvider {
  public:
   TokenServiceProvider(
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
       OAuth2TokenService* token_service);
 
   // OAuth2TokenServiceRequest::TokenServiceProvider implementation.
@@ skipping 96 matching lines @@
   return SyncComponents(model_associator, change_processor);
 }
 
 // static
 void ProfileSyncComponentsFactoryImpl::OverridePrefsForUssTest(bool use_uss) {
   override_prefs_controller_to_uss_for_test_ = use_uss;
 }
 
 bool ProfileSyncComponentsFactoryImpl::
     override_prefs_controller_to_uss_for_test_ = false;
+
+}  // namespace browser_sync