[Sync] Fix namespace for sync_driver component

browser_sync namespace was still in use while transitions were being made.
We're far enough along now that it's worth moving to the sync_driver namespace.

BUG=339728
TBR=bauerb@chromium.org

Review URL: https://codereview.chromium.org/408003002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284799 0039d316-1c4b-4281-b951-d872f2087c98

70 files changed, 177 insertions, 170 deletions

diff --git a/components/sync_driver/backend_data_type_configurer.cc b/components/sync_driver/backend_data_type_configurer.cc
index 189e482..52b3f9b 100644
--- a/components/sync_driver/backend_data_type_configurer.cc
+++ b/components/sync_driver/backend_data_type_configurer.cc
@@ -5,7 +5,7 @@
 
 #include "components/sync_driver/backend_data_type_configurer.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 // static
 syncer::ModelTypeSet
@@ -29,4 +29,4 @@ void BackendDataTypeConfigurer::SetDataTypesState(
   }
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/backend_data_type_configurer.h b/components/sync_driver/backend_data_type_configurer.h
index 0569745..964f63c 100644
--- a/components/sync_driver/backend_data_type_configurer.h
+++ b/components/sync_driver/backend_data_type_configurer.h
@@ -12,7 +12,7 @@
 #include "sync/internal_api/public/configure_reason.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 class ChangeProcessor;
 
@@ -79,6 +79,6 @@ class BackendDataTypeConfigurer {
   virtual ~BackendDataTypeConfigurer() {}
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_BACKEND_DATA_TYPE_CONFIGURER_H_
diff --git a/components/sync_driver/change_processor.cc b/components/sync_driver/change_processor.cc
index 872851e..9ba5ca8 100644
--- a/components/sync_driver/change_processor.cc
+++ b/components/sync_driver/change_processor.cc
@@ -4,7 +4,7 @@
 
 #include "components/sync_driver/change_processor.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 ChangeProcessor::ChangeProcessor(DataTypeErrorHandler* error_handler)
     : error_handler_(error_handler),
@@ -30,4 +30,4 @@ syncer::UserShare* ChangeProcessor::share_handle() const {
   return share_handle_;
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/change_processor.h b/components/sync_driver/change_processor.h
index efefea9..30762be 100644
--- a/components/sync_driver/change_processor.h
+++ b/components/sync_driver/change_processor.h
@@ -14,7 +14,7 @@ namespace syncer {
 class UnrecoverableErrorHandler;
 }  // namespace syncer
 
-namespace browser_sync {
+namespace sync_driver {
 
 class ModelAssociator;
 
@@ -83,6 +83,6 @@ class ChangeProcessor {
   DISALLOW_COPY_AND_ASSIGN(ChangeProcessor);
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_CHANGE_PROCESSOR_H_
diff --git a/components/sync_driver/change_processor_mock.cc b/components/sync_driver/change_processor_mock.cc
index a3b84c5..1529859 100644
--- a/components/sync_driver/change_processor_mock.cc
+++ b/components/sync_driver/change_processor_mock.cc
@@ -6,11 +6,11 @@
 
 #include "base/compiler_specific.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 ChangeProcessorMock::ChangeProcessorMock()
     : ChangeProcessor(this) {}
 
 ChangeProcessorMock::~ChangeProcessorMock() {}
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/change_processor_mock.h b/components/sync_driver/change_processor_mock.h
index 7e064a8..aaa7e82d 100644
--- a/components/sync_driver/change_processor_mock.h
+++ b/components/sync_driver/change_processor_mock.h
@@ -10,7 +10,7 @@
 #include "sync/internal_api/public/util/unrecoverable_error_handler.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 class ChangeProcessorMock
     : public ChangeProcessor, public DataTypeErrorHandler{
@@ -35,6 +35,6 @@ class ChangeProcessorMock
 
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_CHANGE_PROCESSOR_MOCK_H_
diff --git a/components/sync_driver/data_type_controller.cc b/components/sync_driver/data_type_controller.cc
index 0d9d0aa..bfabe75 100644
--- a/components/sync_driver/data_type_controller.cc
+++ b/components/sync_driver/data_type_controller.cc
@@ -8,7 +8,7 @@
 #include "sync/internal_api/public/user_share.h"
 #include "sync/util/data_type_histogram.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 DataTypeController::DataTypeController(
     scoped_refptr<base::MessageLoopProxy> ui_thread,
@@ -60,4 +60,4 @@ bool DataTypeController::ReadyForStart() const {
   return true;
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/data_type_controller.h b/components/sync_driver/data_type_controller.h
index acceace..c1e8a05 100644
--- a/components/sync_driver/data_type_controller.h
+++ b/components/sync_driver/data_type_controller.h
@@ -24,7 +24,7 @@ class SyncError;
 struct UserShare;
 }
 
-namespace browser_sync {
+namespace sync_driver {
 
 class ChangeProcessor;
 
@@ -172,6 +172,6 @@ class DataTypeController
   syncer::UserShare* user_share_;
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_DATA_TYPE_CONTROLLER_H__
diff --git a/components/sync_driver/data_type_controller_mock.cc b/components/sync_driver/data_type_controller_mock.cc
index cf15b53..5dc24c7 100644
--- a/components/sync_driver/data_type_controller_mock.cc
+++ b/components/sync_driver/data_type_controller_mock.cc
@@ -4,7 +4,7 @@
 
 #include "components/sync_driver/data_type_controller_mock.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 StartCallbackMock::StartCallbackMock() {}
 
@@ -14,4 +14,4 @@ ModelLoadCallbackMock::ModelLoadCallbackMock() {}
 
 ModelLoadCallbackMock::~ModelLoadCallbackMock() {}
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/data_type_controller_mock.h b/components/sync_driver/data_type_controller_mock.h
index 1f3b9d6..57fe8ec 100644
--- a/components/sync_driver/data_type_controller_mock.h
+++ b/components/sync_driver/data_type_controller_mock.h
@@ -9,7 +9,7 @@
 #include "sync/api/sync_error.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 class StartCallbackMock {
  public:
@@ -29,6 +29,6 @@ class ModelLoadCallbackMock {
   MOCK_METHOD2(Run, void(syncer::ModelType, syncer::SyncError));
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_DATA_TYPE_CONTROLLER_MOCK_H__
diff --git a/components/sync_driver/data_type_encryption_handler.cc b/components/sync_driver/data_type_encryption_handler.cc
index 8920dc6..4325d56 100644
--- a/components/sync_driver/data_type_encryption_handler.cc
+++ b/components/sync_driver/data_type_encryption_handler.cc
@@ -4,7 +4,7 @@
 
 #include "components/sync_driver/data_type_encryption_handler.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 DataTypeEncryptionHandler::DataTypeEncryptionHandler() {}
 DataTypeEncryptionHandler::~DataTypeEncryptionHandler() {}
diff --git a/components/sync_driver/data_type_encryption_handler.h b/components/sync_driver/data_type_encryption_handler.h
index a4eff7d..ebefd30 100644
--- a/components/sync_driver/data_type_encryption_handler.h
+++ b/components/sync_driver/data_type_encryption_handler.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "sync/internal_api/public/base/model_type.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 // The DataTypeEncryptionHandler provides the status of datatype encryption.
 class DataTypeEncryptionHandler {
@@ -24,6 +24,6 @@ class DataTypeEncryptionHandler {
   virtual syncer::ModelTypeSet GetEncryptedDataTypes() const = 0;
 };
 
-} // namespace browser_sync
+} // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_DATA_TYPE_ENCRYPTION_HANDLER_H_
diff --git a/components/sync_driver/data_type_error_handler.h b/components/sync_driver/data_type_error_handler.h
index 88733b7..a33a151 100644
--- a/components/sync_driver/data_type_error_handler.h
+++ b/components/sync_driver/data_type_error_handler.h
@@ -12,7 +12,7 @@
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/util/unrecoverable_error_handler.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 class DataTypeErrorHandler {
  public:
@@ -34,5 +34,6 @@ class DataTypeErrorHandler {
   virtual ~DataTypeErrorHandler() { }
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
+
 #endif  // COMPONENTS_SYNC_DRIVER_DATA_TYPE_ERROR_HANDLER_H__
diff --git a/components/sync_driver/data_type_error_handler_mock.cc b/components/sync_driver/data_type_error_handler_mock.cc
index 0d62803..d6ab98f 100644
--- a/components/sync_driver/data_type_error_handler_mock.cc
+++ b/components/sync_driver/data_type_error_handler_mock.cc
@@ -4,10 +4,10 @@
 
 #include "components/sync_driver/data_type_error_handler_mock.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 DataTypeErrorHandlerMock::DataTypeErrorHandlerMock() {}
 
 DataTypeErrorHandlerMock::~DataTypeErrorHandlerMock() {}
 
-}
+}  // namespace sync_driver
diff --git a/components/sync_driver/data_type_error_handler_mock.h b/components/sync_driver/data_type_error_handler_mock.h
index beedef0..6e70e2b 100644
--- a/components/sync_driver/data_type_error_handler_mock.h
+++ b/components/sync_driver/data_type_error_handler_mock.h
@@ -8,7 +8,7 @@
 #include "sync/internal_api/public/base/model_type.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 class DataTypeErrorHandlerMock : public DataTypeErrorHandler {
  public:
@@ -23,6 +23,6 @@ class DataTypeErrorHandlerMock : public DataTypeErrorHandler {
 
 };
 
-}  // namesspace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_DATA_TYPE_ERROR_HANDLER_MOCK_H__
diff --git a/components/sync_driver/data_type_manager.cc b/components/sync_driver/data_type_manager.cc
index e3b6b32..433d5ca 100644
--- a/components/sync_driver/data_type_manager.cc
+++ b/components/sync_driver/data_type_manager.cc
@@ -4,7 +4,7 @@
 
 #include "components/sync_driver/data_type_manager.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 DataTypeManager::ConfigureResult::ConfigureResult()
     : status(UNKNOWN) {
@@ -51,4 +51,4 @@ std::string DataTypeManager::ConfigureStatusToString(ConfigureStatus status) {
   }
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/data_type_manager.h b/components/sync_driver/data_type_manager.h
index d7287f2..ecb3f0c 100644
--- a/components/sync_driver/data_type_manager.h
+++ b/components/sync_driver/data_type_manager.h
@@ -14,7 +14,7 @@
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/configure_reason.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 // This interface is for managing the start up and shut down life cycle
 // of many different syncable data types.
@@ -106,6 +106,6 @@ class DataTypeManager {
   virtual State state() const = 0;
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_DATA_TYPE_MANAGER_H__
diff --git a/components/sync_driver/data_type_manager_impl.cc b/components/sync_driver/data_type_manager_impl.cc
index ba1709e..8f75985 100644
--- a/components/sync_driver/data_type_manager_impl.cc
+++ b/components/sync_driver/data_type_manager_impl.cc
@@ -21,7 +21,7 @@
 #include "components/sync_driver/failed_data_types_handler.h"
 #include "sync/internal_api/public/data_type_debug_info_listener.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 namespace {
 
@@ -49,10 +49,10 @@ DataTypeManagerImpl::DataTypeManagerImpl(
     const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&
         debug_info_listener,
     const DataTypeController::TypeMap* controllers,
-    const browser_sync::DataTypeEncryptionHandler* encryption_handler,
+    const DataTypeEncryptionHandler* encryption_handler,
     BackendDataTypeConfigurer* configurer,
     DataTypeManagerObserver* observer,
-    browser_sync::FailedDataTypesHandler* failed_data_types_handler)
+    FailedDataTypesHandler* failed_data_types_handler)
     : configurer_(configurer),
       controllers_(controllers),
       state_(DataTypeManager::STOPPED),
@@ -614,4 +614,4 @@ void DataTypeManagerImpl::AddToConfigureTime() {
   configure_time_delta_ += (base::Time::Now() - last_restart_time_);
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/data_type_manager_impl.h b/components/sync_driver/data_type_manager_impl.h
index 461ae6b..6beb108 100644
--- a/components/sync_driver/data_type_manager_impl.h
+++ b/components/sync_driver/data_type_manager_impl.h
@@ -25,7 +25,7 @@ class DataTypeDebugInfoListener;
 template <typename T> class WeakHandle;
 }
 
-namespace browser_sync {
+namespace sync_driver {
 
 class DataTypeController;
 class DataTypeEncryptionHandler;
@@ -161,7 +161,7 @@ class DataTypeManagerImpl : public DataTypeManager,
 
   // For querying failed data types (having unrecoverable error) when
   // configuring backend.
-  browser_sync::FailedDataTypesHandler* failed_data_types_handler_;
+  FailedDataTypesHandler* failed_data_types_handler_;
 
   // Types waiting to be downloaded.
   TypeSetPriorityList download_types_queue_;
@@ -182,7 +182,7 @@ class DataTypeManagerImpl : public DataTypeManager,
 
   // The encryption handler lets the DataTypeManager know the state of sync
   // datatype encryption.
-  const browser_sync::DataTypeEncryptionHandler* encryption_handler_;
+  const DataTypeEncryptionHandler* encryption_handler_;
 
   // Association and time stats of data type configuration.
   std::vector<syncer::DataTypeConfigurationStats> configuration_stats_;
@@ -194,6 +194,6 @@ class DataTypeManagerImpl : public DataTypeManager,
   DISALLOW_COPY_AND_ASSIGN(DataTypeManagerImpl);
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_DATA_TYPE_MANAGER_IMPL_H__
diff --git a/components/sync_driver/data_type_manager_impl_unittest.cc b/components/sync_driver/data_type_manager_impl_unittest.cc
index 840e69a..2f35d03 100644
--- a/components/sync_driver/data_type_manager_impl_unittest.cc
+++ b/components/sync_driver/data_type_manager_impl_unittest.cc
@@ -17,7 +17,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 using syncer::ModelType;
 using syncer::ModelTypeSet;
@@ -104,7 +104,7 @@ class DataTypeManagerObserverMock : public DataTypeManagerObserver {
   virtual ~DataTypeManagerObserverMock() {}
 
   MOCK_METHOD1(OnConfigureDone,
-               void(const browser_sync::DataTypeManager::ConfigureResult&));
+               void(const DataTypeManager::ConfigureResult&));
   MOCK_METHOD0(OnConfigureRetry, void());
   MOCK_METHOD0(OnConfigureStart, void());
 };
@@ -1196,4 +1196,4 @@ TEST_F(SyncDataTypeManagerImplTest, ReenableAfterDataTypeError) {
   EXPECT_EQ(DataTypeController::RUNNING, GetController(BOOKMARKS)->state());
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/data_type_manager_mock.cc b/components/sync_driver/data_type_manager_mock.cc
index 9a18407..c1ce5ca 100644
--- a/components/sync_driver/data_type_manager_mock.cc
+++ b/components/sync_driver/data_type_manager_mock.cc
@@ -5,7 +5,7 @@
 #include "base/location.h"
 #include "components/sync_driver/data_type_manager_mock.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 DataTypeManagerMock::DataTypeManagerMock()
     : result_(OK, syncer::ModelTypeSet()) {
@@ -13,4 +13,4 @@ DataTypeManagerMock::DataTypeManagerMock()
 
 DataTypeManagerMock::~DataTypeManagerMock() {}
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/data_type_manager_mock.h b/components/sync_driver/data_type_manager_mock.h
index 5159a20..50c4fe0 100644
--- a/components/sync_driver/data_type_manager_mock.h
+++ b/components/sync_driver/data_type_manager_mock.h
@@ -9,7 +9,7 @@
 #include "sync/api/sync_error.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 class DataTypeManagerMock : public DataTypeManager {
  public:
@@ -24,9 +24,9 @@ class DataTypeManagerMock : public DataTypeManager {
   MOCK_CONST_METHOD0(state, State());
 
  private:
-  browser_sync::DataTypeManager::ConfigureResult result_;
+  DataTypeManager::ConfigureResult result_;
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_DATA_TYPE_MANAGER_MOCK_H__
diff --git a/components/sync_driver/data_type_manager_observer.h b/components/sync_driver/data_type_manager_observer.h
index 32d4d6b..4e7289d 100644
--- a/components/sync_driver/data_type_manager_observer.h
+++ b/components/sync_driver/data_type_manager_observer.h
@@ -7,14 +7,14 @@
 
 #include "components/sync_driver/data_type_manager.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 // Various data type configuration events can be consumed by observing the
 // DataTypeManager through this interface.
 class DataTypeManagerObserver {
  public:
   virtual void OnConfigureDone(
-      const browser_sync::DataTypeManager::ConfigureResult& result) = 0;
+      const DataTypeManager::ConfigureResult& result) = 0;
   virtual void OnConfigureRetry() = 0;
   virtual void OnConfigureStart() = 0;
 
@@ -22,6 +22,6 @@ class DataTypeManagerObserver {
   virtual ~DataTypeManagerObserver() { }
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_DATA_TYPE_MANAGER_OBSERVER_H_
diff --git a/components/sync_driver/failed_data_types_handler.cc b/components/sync_driver/failed_data_types_handler.cc
index 058482d..cb18feb 100644
--- a/components/sync_driver/failed_data_types_handler.cc
+++ b/components/sync_driver/failed_data_types_handler.cc
@@ -5,9 +5,7 @@
 #include "components/sync_driver/data_type_manager.h"
 #include "components/sync_driver/failed_data_types_handler.h"
 
-using browser_sync::DataTypeManager;
-
-namespace browser_sync {
+namespace sync_driver {
 
 namespace {
 
@@ -138,4 +136,4 @@ bool FailedDataTypesHandler::AnyFailedDataType() const {
          !crypto_errors_.empty();
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/failed_data_types_handler.h b/components/sync_driver/failed_data_types_handler.h
index 3820a24..93b6fae 100644
--- a/components/sync_driver/failed_data_types_handler.h
+++ b/components/sync_driver/failed_data_types_handler.h
@@ -9,7 +9,7 @@
 
 #include "components/sync_driver/data_type_manager.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 // Class to keep track of data types that have encountered an error during sync.
 class FailedDataTypesHandler {
@@ -88,6 +88,6 @@ class FailedDataTypesHandler {
   DISALLOW_COPY_AND_ASSIGN(FailedDataTypesHandler);
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_FAILED_DATA_TYPES_HANDLER_H_
diff --git a/components/sync_driver/fake_data_type_controller.cc b/components/sync_driver/fake_data_type_controller.cc
index 23dc7f4..1aeb0fb 100644
--- a/components/sync_driver/fake_data_type_controller.cc
+++ b/components/sync_driver/fake_data_type_controller.cc
@@ -8,7 +8,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using syncer::ModelType;
-namespace browser_sync {
+
+namespace sync_driver {
 
 FakeDataTypeController::FakeDataTypeController(ModelType type)
       : DataTypeController(base::MessageLoopProxy::current(), base::Closure(),
@@ -151,4 +152,4 @@ void FakeDataTypeController::SimulateModelLoadFinishing() {
   model_load_callback_.Reset();
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/fake_data_type_controller.h b/components/sync_driver/fake_data_type_controller.h
index c0e5fef..4fa5f7b 100644
--- a/components/sync_driver/fake_data_type_controller.h
+++ b/components/sync_driver/fake_data_type_controller.h
@@ -8,7 +8,8 @@
 #include "components/sync_driver/data_type_controller.h"
 #include "components/sync_driver/data_type_manager.h"
 
-namespace browser_sync {
+namespace sync_driver {
+
 // Fake DataTypeController implementation that simulates the state
 // machine of a typical asynchronous data type.
 //
@@ -65,5 +66,6 @@ class FakeDataTypeController : public DataTypeController {
   syncer::SyncError load_error_;
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
+
 #endif  // COMPONENTS_SYNC_DRIVER_FAKE_DATA_TYPE_CONTROLLER_H__
diff --git a/components/sync_driver/fake_generic_change_processor.cc b/components/sync_driver/fake_generic_change_processor.cc
index 9711e76..922fc62 100644
--- a/components/sync_driver/fake_generic_change_processor.cc
+++ b/components/sync_driver/fake_generic_change_processor.cc
@@ -9,7 +9,7 @@
 #include "sync/api/attachments/attachment_service_impl.h"
 #include "sync/api/syncable_service.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 FakeGenericChangeProcessor::FakeGenericChangeProcessor(
     SyncApiComponentFactory* sync_factory)
@@ -73,11 +73,11 @@ FakeGenericChangeProcessorFactory::~FakeGenericChangeProcessorFactory() {}
 scoped_ptr<GenericChangeProcessor>
 FakeGenericChangeProcessorFactory::CreateGenericChangeProcessor(
     syncer::UserShare* user_share,
-    browser_sync::DataTypeErrorHandler* error_handler,
+    DataTypeErrorHandler* error_handler,
     const base::WeakPtr<syncer::SyncableService>& local_service,
     const base::WeakPtr<syncer::SyncMergeResult>& merge_result,
     SyncApiComponentFactory* sync_factory) {
   return processor_.PassAs<GenericChangeProcessor>();
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/fake_generic_change_processor.h b/components/sync_driver/fake_generic_change_processor.h
index bb7b443..671e0fc 100644
--- a/components/sync_driver/fake_generic_change_processor.h
+++ b/components/sync_driver/fake_generic_change_processor.h
@@ -11,7 +11,7 @@
 #include "components/sync_driver/sync_api_component_factory.h"
 #include "sync/api/sync_error.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 // A fake GenericChangeProcessor that can return arbitrary values.
 class FakeGenericChangeProcessor : public GenericChangeProcessor {
@@ -50,7 +50,7 @@ class FakeGenericChangeProcessorFactory : public GenericChangeProcessorFactory {
   virtual ~FakeGenericChangeProcessorFactory();
   virtual scoped_ptr<GenericChangeProcessor> CreateGenericChangeProcessor(
       syncer::UserShare* user_share,
-      browser_sync::DataTypeErrorHandler* error_handler,
+      DataTypeErrorHandler* error_handler,
       const base::WeakPtr<syncer::SyncableService>& local_service,
       const base::WeakPtr<syncer::SyncMergeResult>& merge_result,
       SyncApiComponentFactory* sync_factory) OVERRIDE;
@@ -60,6 +60,6 @@ class FakeGenericChangeProcessorFactory : public GenericChangeProcessorFactory {
   DISALLOW_COPY_AND_ASSIGN(FakeGenericChangeProcessorFactory);
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_FAKE_GENERIC_CHANGE_PROCESSOR_H_
diff --git a/components/sync_driver/generic_change_processor.cc b/components/sync_driver/generic_change_processor.cc
index 4cd943c..d7a5c6e 100644
--- a/components/sync_driver/generic_change_processor.cc
+++ b/components/sync_driver/generic_change_processor.cc
@@ -20,7 +20,7 @@
 #include "sync/internal_api/public/write_transaction.h"
 #include "sync/syncable/entry.h"  // TODO(tim): Bug 123674.
 
-namespace browser_sync {
+namespace sync_driver {
 
 namespace {
 
@@ -732,4 +732,4 @@ syncer::UserShare* GenericChangeProcessor::share_handle() const {
   return share_handle_;
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/generic_change_processor.h b/components/sync_driver/generic_change_processor.h
index 90f112e..03ff863 100644
--- a/components/sync_driver/generic_change_processor.h
+++ b/components/sync_driver/generic_change_processor.h
@@ -27,7 +27,7 @@ class WriteTransaction;
 typedef std::vector<syncer::SyncData> SyncDataList;
 }  // namespace syncer
 
-namespace browser_sync {
+namespace sync_driver {
 class SyncApiComponentFactory;
 
 // Datatype agnostic change processor. One instance of GenericChangeProcessor
@@ -158,6 +158,6 @@ class GenericChangeProcessor : public ChangeProcessor,
   DISALLOW_COPY_AND_ASSIGN(GenericChangeProcessor);
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_GENERIC_CHANGE_PROCESSOR_H_
diff --git a/components/sync_driver/generic_change_processor_factory.cc b/components/sync_driver/generic_change_processor_factory.cc
index 463d6e3..7288049 100644
--- a/components/sync_driver/generic_change_processor_factory.cc
+++ b/components/sync_driver/generic_change_processor_factory.cc
@@ -6,7 +6,7 @@
 
 #include "components/sync_driver/generic_change_processor.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 
 GenericChangeProcessorFactory::GenericChangeProcessorFactory() {}
@@ -16,7 +16,7 @@ GenericChangeProcessorFactory::~GenericChangeProcessorFactory() {}
 scoped_ptr<GenericChangeProcessor>
 GenericChangeProcessorFactory::CreateGenericChangeProcessor(
     syncer::UserShare* user_share,
-    browser_sync::DataTypeErrorHandler* error_handler,
+    DataTypeErrorHandler* error_handler,
     const base::WeakPtr<syncer::SyncableService>& local_service,
     const base::WeakPtr<syncer::SyncMergeResult>& merge_result,
     SyncApiComponentFactory* sync_factory) {
@@ -26,6 +26,6 @@ GenericChangeProcessorFactory::CreateGenericChangeProcessor(
                                                     merge_result,
                                                     user_share,
                                                     sync_factory)).Pass();
-  }
+}
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/generic_change_processor_factory.h b/components/sync_driver/generic_change_processor_factory.h
index ce19b22..5ed06a5 100644
--- a/components/sync_driver/generic_change_processor_factory.h
+++ b/components/sync_driver/generic_change_processor_factory.h
@@ -14,7 +14,7 @@ class SyncMergeResult;
 struct UserShare;
 }
 
-namespace browser_sync {
+namespace sync_driver {
 
 class DataTypeErrorHandler;
 class GenericChangeProcessor;
@@ -35,7 +35,7 @@ class GenericChangeProcessorFactory {
   virtual ~GenericChangeProcessorFactory();
   virtual scoped_ptr<GenericChangeProcessor> CreateGenericChangeProcessor(
       syncer::UserShare* user_share,
-      browser_sync::DataTypeErrorHandler* error_handler,
+      DataTypeErrorHandler* error_handler,
       const base::WeakPtr<syncer::SyncableService>& local_service,
       const base::WeakPtr<syncer::SyncMergeResult>& merge_result,
       SyncApiComponentFactory* sync_factory);
@@ -44,6 +44,6 @@ class GenericChangeProcessorFactory {
   DISALLOW_COPY_AND_ASSIGN(GenericChangeProcessorFactory);
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_GENERIC_CHANGE_PROCESSOR_FACTORY_H_
diff --git a/components/sync_driver/generic_change_processor_unittest.cc b/components/sync_driver/generic_change_processor_unittest.cc
index 9b38445..f5ba074 100644
--- a/components/sync_driver/generic_change_processor_unittest.cc
+++ b/components/sync_driver/generic_change_processor_unittest.cc
@@ -27,7 +27,7 @@
 #include "sync/internal_api/public/write_transaction.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 namespace {
 
@@ -419,4 +419,4 @@ TEST_F(SyncGenericChangeProcessorTest, AttachmentUploaded) {
 
 }  // namespace
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/model_association_manager.cc b/components/sync_driver/model_association_manager.cc
index 57a8a28..7a2aaf8 100644
--- a/components/sync_driver/model_association_manager.cc
+++ b/components/sync_driver/model_association_manager.cc
@@ -15,7 +15,7 @@
 
 using syncer::ModelTypeSet;
 
-namespace browser_sync {
+namespace sync_driver {
 
 namespace {
 
@@ -461,4 +461,4 @@ base::OneShotTimer<ModelAssociationManager>*
   return &timer_;
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/model_association_manager.h b/components/sync_driver/model_association_manager.h
index 8b53940..f737c59 100644
--- a/components/sync_driver/model_association_manager.h
+++ b/components/sync_driver/model_association_manager.h
@@ -14,15 +14,15 @@
 #include "sync/internal_api/public/data_type_association_stats.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 
+namespace sync_driver {
+
+class DataTypeController;
+
 // |ModelAssociationManager| does the heavy lifting for doing the actual model
 // association. It instructs DataTypeControllers to load models, start
 // associating and stopping. Since the operations are async it uses an
 // interface to inform DataTypeManager the results of the operations.
 // This class is owned by DataTypeManager.
-namespace browser_sync {
-
-class DataTypeController;
-
 // |ModelAssociationManager| association functions are async. The results of
 // those operations are passed back via this interface.
 class ModelAssociationManagerDelegate {
@@ -167,5 +167,7 @@ class ModelAssociationManager {
 
   DISALLOW_COPY_AND_ASSIGN(ModelAssociationManager);
 };
-}  // namespace browser_sync
+
+}  // namespace sync_driver
+
 #endif  // COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATION_MANAGER_H__
diff --git a/components/sync_driver/model_association_manager_unittest.cc b/components/sync_driver/model_association_manager_unittest.cc
index 214b1b8..9282f3b 100644
--- a/components/sync_driver/model_association_manager_unittest.cc
+++ b/components/sync_driver/model_association_manager_unittest.cc
@@ -10,7 +10,9 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
-namespace browser_sync {
+
+namespace sync_driver {
+
 class MockModelAssociationManagerDelegate :
     public ModelAssociationManagerDelegate {
  public:
@@ -388,4 +390,4 @@ TEST_F(SyncModelAssociationManagerTest, ModelLoadFailBeforeAssociationStart) {
             GetController(controllers_, syncer::BOOKMARKS)->state());
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/model_associator.h b/components/sync_driver/model_associator.h
index b7ec7b6..0bc6d7a 100644
--- a/components/sync_driver/model_associator.h
+++ b/components/sync_driver/model_associator.h
@@ -15,7 +15,7 @@ class BaseNode;
 class SyncMergeResult;
 }
 
-namespace browser_sync {
+namespace sync_driver {
 
 // This represents the fundamental operations used for model association that
 // are common to all ModelAssociators and do not depend on types of the models
@@ -90,6 +90,6 @@ class PerDataTypeAssociatorInterface : public AssociatorInterface {
   virtual void Disassociate(int64 sync_id) = 0;
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATOR_H_
diff --git a/components/sync_driver/model_associator_mock.cc b/components/sync_driver/model_associator_mock.cc
index 199555b..24b5955 100644
--- a/components/sync_driver/model_associator_mock.cc
+++ b/components/sync_driver/model_associator_mock.cc
@@ -4,10 +4,10 @@
 
 #include "components/sync_driver/model_associator_mock.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 ModelAssociatorMock::ModelAssociatorMock() {}
 
 ModelAssociatorMock::~ModelAssociatorMock() {}
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/model_associator_mock.h b/components/sync_driver/model_associator_mock.h
index ba35d4b..4619c83 100644
--- a/components/sync_driver/model_associator_mock.h
+++ b/components/sync_driver/model_associator_mock.h
@@ -10,7 +10,7 @@
 #include "sync/api/sync_error.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 ACTION_P(SetSyncError, type) {
   arg0->Reset(FROM_HERE, "test", type);
@@ -30,6 +30,6 @@ class ModelAssociatorMock : public AssociatorInterface {
   MOCK_METHOD0(CryptoReadyIfNecessary, bool());
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATOR_MOCK_H__
diff --git a/components/sync_driver/non_blocking_data_type_controller.cc b/components/sync_driver/non_blocking_data_type_controller.cc
index 21b1dab..5b2b528 100644
--- a/components/sync_driver/non_blocking_data_type_controller.cc
+++ b/components/sync_driver/non_blocking_data_type_controller.cc
@@ -9,7 +9,7 @@
 #include "base/location.h"
 #include "sync/engine/model_type_sync_proxy_impl.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 NonBlockingDataTypeController::NonBlockingDataTypeController(
     syncer::ModelType type, bool is_preferred)
@@ -134,4 +134,4 @@ NonBlockingDataTypeController::GetDesiredState() const {
   }
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/non_blocking_data_type_controller.h b/components/sync_driver/non_blocking_data_type_controller.h
index 080e821..0d7026d 100644
--- a/components/sync_driver/non_blocking_data_type_controller.h
+++ b/components/sync_driver/non_blocking_data_type_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SYNC_NON_BLOCKING_DATA_TYPE_CONTROLLER_H_
-#define CHROME_BROWSER_SYNC_NON_BLOCKING_DATA_TYPE_CONTROLLER_H_
+#ifndef COMPONENTS_SYNC_DRIVER_NON_BLOCKING_DATA_TYPE_CONTROLLER_H_
+#define COMPONENTS_SYNC_DRIVER_NON_BLOCKING_DATA_TYPE_CONTROLLER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -15,7 +15,7 @@ namespace syncer {
 class ModelTypeSyncProxy;
 }
 
-namespace browser_sync {
+namespace sync_driver {
 
 // Lives on the UI thread and manages the interactions between many sync
 // components.
@@ -134,6 +134,6 @@ class NonBlockingDataTypeController {
   DISALLOW_COPY_AND_ASSIGN(NonBlockingDataTypeController);
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
-#endif  // CHROME_BROWSER_SYNC_NON_BLOCKING_DATA_TYPE_CONTROLLER_H_
+#endif  // COMPONENTS_SYNC_DRIVER_NON_BLOCKING_DATA_TYPE_CONTROLLER_H_
diff --git a/components/sync_driver/non_blocking_data_type_controller_unittest.cc b/components/sync_driver/non_blocking_data_type_controller_unittest.cc
index 9ecd129..9cf9489a 100644
--- a/components/sync_driver/non_blocking_data_type_controller_unittest.cc
+++ b/components/sync_driver/non_blocking_data_type_controller_unittest.cc
@@ -17,19 +17,20 @@
 #include "sync/internal_api/public/sync_context_proxy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace syncer {
+namespace sync_driver {
 
 class ModelTypeSyncWorker;
 
 namespace {
 
 // A useless instance of ModelTypeSyncWorker.
-class NullModelTypeSyncWorker : public ModelTypeSyncWorker {
+class NullModelTypeSyncWorker : public syncer::ModelTypeSyncWorker {
  public:
   NullModelTypeSyncWorker();
   virtual ~NullModelTypeSyncWorker();
 
-  virtual void EnqueueForCommit(const CommitRequestDataList& list) OVERRIDE;
+  virtual void EnqueueForCommit(
+      const syncer::CommitRequestDataList& list) OVERRIDE;
 };
 
 NullModelTypeSyncWorker::NullModelTypeSyncWorker() {
@@ -39,7 +40,7 @@ NullModelTypeSyncWorker::~NullModelTypeSyncWorker() {
 }
 
 void NullModelTypeSyncWorker::EnqueueForCommit(
-    const CommitRequestDataList& list) {
+    const syncer::CommitRequestDataList& list) {
   NOTREACHED() << "Not implemented.";
 }
 
@@ -55,7 +56,7 @@ class MockSyncContext {
         FROM_HERE,
         base::Bind(&syncer::ModelTypeSyncProxyImpl::OnConnect,
                    type_proxy,
-                   base::Passed(scoped_ptr<ModelTypeSyncWorker>(
+                   base::Passed(scoped_ptr<syncer::ModelTypeSyncWorker>(
                                     new NullModelTypeSyncWorker()).Pass())));
   }
 
@@ -83,7 +84,7 @@ class MockSyncContextProxy : public syncer::SyncContextProxy {
 
   virtual void ConnectTypeToSync(
       syncer::ModelType type,
-      const DataTypeState& data_type_state,
+      const syncer::DataTypeState& data_type_state,
       const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& type_proxy)
       OVERRIDE {
     // Normally we'd use MessageLoopProxy::current() as the TaskRunner argument
@@ -186,7 +187,7 @@ class NonBlockingDataTypeControllerTest : public testing::Test {
   scoped_refptr<base::TestSimpleTaskRunner> model_thread_;
   scoped_refptr<base::TestSimpleTaskRunner> sync_thread_;
 
-  browser_sync::NonBlockingDataTypeController controller_;
+  NonBlockingDataTypeController controller_;
 
   MockSyncContext mock_sync_context_;
   MockSyncContextProxy mock_context_proxy_;
@@ -436,4 +437,4 @@ TEST_F(NonBlockingDataTypeControllerTest, EnableDisableEnableRace) {
   EXPECT_TRUE(type_sync_proxy_.IsConnected());
 }
 
-}  // namespace syncer
+}  // namespace sync_driver
diff --git a/components/sync_driver/non_blocking_data_type_manager.cc b/components/sync_driver/non_blocking_data_type_manager.cc
index 348d0a6..9aa8aac 100644
--- a/components/sync_driver/non_blocking_data_type_manager.cc
+++ b/components/sync_driver/non_blocking_data_type_manager.cc
@@ -8,7 +8,7 @@
 #include "components/sync_driver/non_blocking_data_type_controller.h"
 #include "sync/engine/model_type_sync_proxy_impl.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 NonBlockingDataTypeManager::NonBlockingDataTypeManager()
     : non_blocking_data_type_controllers_deleter_(
@@ -75,4 +75,4 @@ syncer::ModelTypeSet NonBlockingDataTypeManager::GetRegisteredTypes() const {
   return result;
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/non_blocking_data_type_manager.h b/components/sync_driver/non_blocking_data_type_manager.h
index 19b4731..762ccab 100644
--- a/components/sync_driver/non_blocking_data_type_manager.h
+++ b/components/sync_driver/non_blocking_data_type_manager.h
@@ -22,7 +22,7 @@ class ModelTypeSyncProxyImpl;
 class SyncContextProxy;
 }  //namespace syncer
 
-namespace browser_sync {
+namespace sync_driver {
 
 class NonBlockingDataTypeController;
 
@@ -67,7 +67,7 @@ class NonBlockingDataTypeManager {
 
  private:
   typedef
-      std::map<syncer::ModelType, browser_sync::NonBlockingDataTypeController*>
+      std::map<syncer::ModelType, NonBlockingDataTypeController*>
       NonBlockingDataTypeControllerMap;
 
   // List of data type controllers for non-blocking types.
@@ -78,6 +78,6 @@ class NonBlockingDataTypeManager {
       non_blocking_data_type_controllers_deleter_;
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_NON_BLOCKING_DATA_TYPE_MANAGER_H_
diff --git a/components/sync_driver/non_ui_data_type_controller.cc b/components/sync_driver/non_ui_data_type_controller.cc
index f00de48..a7dcf26 100644
--- a/components/sync_driver/non_ui_data_type_controller.cc
+++ b/components/sync_driver/non_ui_data_type_controller.cc
@@ -14,7 +14,7 @@
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/util/data_type_histogram.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 SharedChangeProcessor*
 NonUIDataTypeController::CreateSharedChangeProcessor() {
@@ -437,4 +437,4 @@ void NonUIDataTypeController::StopLocalService() {
   local_service_.reset();
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/non_ui_data_type_controller.h b/components/sync_driver/non_ui_data_type_controller.h
index 365ac6d..4143906 100644
--- a/components/sync_driver/non_ui_data_type_controller.h
+++ b/components/sync_driver/non_ui_data_type_controller.h
@@ -18,7 +18,7 @@ namespace syncer {
 class SyncableService;
 }
 
-namespace browser_sync {
+namespace sync_driver {
 
 class SyncApiComponentFactory;
 
@@ -162,6 +162,6 @@ class NonUIDataTypeController : public DataTypeController {
   scoped_refptr<base::MessageLoopProxy> ui_thread_;
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_NON_UI_DATA_TYPE_CONTROLLER_H_
diff --git a/components/sync_driver/non_ui_data_type_controller_mock.cc b/components/sync_driver/non_ui_data_type_controller_mock.cc
index a20e2d7..f68ea42 100644
--- a/components/sync_driver/non_ui_data_type_controller_mock.cc
+++ b/components/sync_driver/non_ui_data_type_controller_mock.cc
@@ -4,10 +4,10 @@
 
 #include "components/sync_driver/non_ui_data_type_controller_mock.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 NonUIDataTypeControllerMock::NonUIDataTypeControllerMock() {}
 
 NonUIDataTypeControllerMock::~NonUIDataTypeControllerMock() {}
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/non_ui_data_type_controller_mock.h b/components/sync_driver/non_ui_data_type_controller_mock.h
index f15eec3..68f889f 100644
--- a/components/sync_driver/non_ui_data_type_controller_mock.h
+++ b/components/sync_driver/non_ui_data_type_controller_mock.h
@@ -9,7 +9,7 @@
 #include "sync/api/sync_error.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 class NonUIDataTypeControllerMock
     : public NonUIDataTypeController {
@@ -52,6 +52,6 @@ class NonUIDataTypeControllerMock
   virtual ~NonUIDataTypeControllerMock();
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_NON_UI_DATA_TYPE_CONTROLLER_MOCK_H_
diff --git a/components/sync_driver/non_ui_data_type_controller_unittest.cc b/components/sync_driver/non_ui_data_type_controller_unittest.cc
index 4a2273e..869a8bb 100644
--- a/components/sync_driver/non_ui_data_type_controller_unittest.cc
+++ b/components/sync_driver/non_ui_data_type_controller_unittest.cc
@@ -23,7 +23,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 namespace {
 
@@ -61,7 +61,7 @@ class SharedChangeProcessorMock : public SharedChangeProcessor {
   SharedChangeProcessorMock() {}
 
   MOCK_METHOD6(Connect, base::WeakPtr<syncer::SyncableService>(
-      browser_sync::SyncApiComponentFactory*,
+      SyncApiComponentFactory*,
       GenericChangeProcessorFactory*,
       syncer::UserShare*,
       DataTypeErrorHandler*,
@@ -93,7 +93,7 @@ class NonUIDataTypeControllerFake
     : public NonUIDataTypeController {
  public:
   NonUIDataTypeControllerFake(
-      browser_sync::SyncApiComponentFactory* sync_factory,
+      SyncApiComponentFactory* sync_factory,
       NonUIDataTypeControllerMock* mock,
       SharedChangeProcessor* change_processor,
       const DisableTypeCallback& disable_callback,
@@ -520,4 +520,4 @@ TEST_F(SyncNonUIDataTypeControllerTest,
 
 }  // namespace
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/proxy_data_type_controller.cc b/components/sync_driver/proxy_data_type_controller.cc
index 22344a6..ae1ea53 100644
--- a/components/sync_driver/proxy_data_type_controller.cc
+++ b/components/sync_driver/proxy_data_type_controller.cc
@@ -4,7 +4,7 @@
 
 #include "components/sync_driver/proxy_data_type_controller.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 ProxyDataTypeController::ProxyDataTypeController(
     scoped_refptr<base::MessageLoopProxy> ui_thread,
@@ -70,4 +70,4 @@ void ProxyDataTypeController::OnModelLoaded() {
   NOTIMPLEMENTED();
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/proxy_data_type_controller.h b/components/sync_driver/proxy_data_type_controller.h
index b5e3cf2..e90ee24 100644
--- a/components/sync_driver/proxy_data_type_controller.h
+++ b/components/sync_driver/proxy_data_type_controller.h
@@ -9,7 +9,7 @@
 #include "base/compiler_specific.h"
 #include "components/sync_driver/data_type_controller.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 // Implementation for proxy datatypes. These are datatype that have no
 // representation in sync, and therefore no change processor or syncable
@@ -52,6 +52,6 @@ class ProxyDataTypeController : public DataTypeController {
   DISALLOW_COPY_AND_ASSIGN(ProxyDataTypeController);
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_PROXY_DATA_TYPE_CONTROLLER_H__
diff --git a/components/sync_driver/shared_change_processor.cc b/components/sync_driver/shared_change_processor.cc
index b9eae4b..945f9c6 100644
--- a/components/sync_driver/shared_change_processor.cc
+++ b/components/sync_driver/shared_change_processor.cc
@@ -12,7 +12,7 @@
 
 using base::AutoLock;
 
-namespace browser_sync {
+namespace sync_driver {
 
 SharedChangeProcessor::SharedChangeProcessor()
     : disconnected_(false),
@@ -43,7 +43,7 @@ SharedChangeProcessor::~SharedChangeProcessor() {
 }
 
 base::WeakPtr<syncer::SyncableService> SharedChangeProcessor::Connect(
-    browser_sync::SyncApiComponentFactory* sync_factory,
+    SyncApiComponentFactory* sync_factory,
     GenericChangeProcessorFactory* processor_factory,
     syncer::UserShare* user_share,
     DataTypeErrorHandler* error_handler,
@@ -208,4 +208,4 @@ syncer::SyncError SharedChangeProcessor::CreateAndUploadError(
   }
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/shared_change_processor.h b/components/sync_driver/shared_change_processor.h
index b2b101e..fee93fe 100644
--- a/components/sync_driver/shared_change_processor.h
+++ b/components/sync_driver/shared_change_processor.h
@@ -23,7 +23,7 @@ class SyncableService;
 struct UserShare;
 }  // namespace syncer
 
-namespace browser_sync {
+namespace sync_driver {
 
 class ChangeProcessor;
 class GenericChangeProcessor;
@@ -60,7 +60,7 @@ class SharedChangeProcessor
   // Note: If this SharedChangeProcessor has been disconnected, or the
   // syncer::SyncableService was not alive, will return a null weak pointer.
   virtual base::WeakPtr<syncer::SyncableService> Connect(
-      browser_sync::SyncApiComponentFactory* sync_factory,
+      SyncApiComponentFactory* sync_factory,
       GenericChangeProcessorFactory* processor_factory,
       syncer::UserShare* user_share,
       DataTypeErrorHandler* error_handler,
@@ -137,6 +137,6 @@ class SharedChangeProcessor
   DISALLOW_COPY_AND_ASSIGN(SharedChangeProcessor);
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_SHARED_CHANGE_PROCESSOR_H_
diff --git a/components/sync_driver/shared_change_processor_ref.cc b/components/sync_driver/shared_change_processor_ref.cc
index a833eff..0ba2605 100644
--- a/components/sync_driver/shared_change_processor_ref.cc
+++ b/components/sync_driver/shared_change_processor_ref.cc
@@ -4,7 +4,7 @@
 
 #include "components/sync_driver/shared_change_processor_ref.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 SharedChangeProcessorRef::SharedChangeProcessorRef(
     const scoped_refptr<SharedChangeProcessor>& change_processor)
@@ -39,4 +39,4 @@ syncer::SyncError SharedChangeProcessorRef::CreateAndUploadError(
   return change_processor_->CreateAndUploadError(from_here, message);
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/shared_change_processor_ref.h b/components/sync_driver/shared_change_processor_ref.h
index b3974cb..e5dec81 100644
--- a/components/sync_driver/shared_change_processor_ref.h
+++ b/components/sync_driver/shared_change_processor_ref.h
@@ -11,7 +11,7 @@
 #include "sync/api/sync_change_processor.h"
 #include "sync/api/sync_error_factory.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 // A syncer::SyncChangeProcessor stub for interacting with a refcounted
 // SharedChangeProcessor.
@@ -19,7 +19,7 @@ class SharedChangeProcessorRef : public syncer::SyncChangeProcessor,
                                  public syncer::SyncErrorFactory {
  public:
   SharedChangeProcessorRef(
-      const scoped_refptr<browser_sync::SharedChangeProcessor>&
+      const scoped_refptr<SharedChangeProcessor>&
           change_processor);
   virtual ~SharedChangeProcessorRef();
 
@@ -42,9 +42,9 @@ class SharedChangeProcessorRef : public syncer::SyncChangeProcessor,
   // Default copy and assign welcome (and safe due to refcounted-ness).
 
  private:
-  scoped_refptr<browser_sync::SharedChangeProcessor> change_processor_;
+  scoped_refptr<SharedChangeProcessor> change_processor_;
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_SHARED_CHANGE_PROCESSOR_H_REF_H_
diff --git a/components/sync_driver/shared_change_processor_unittest.cc b/components/sync_driver/shared_change_processor_unittest.cc
index 0282b15..ad8538b 100644
--- a/components/sync_driver/shared_change_processor_unittest.cc
+++ b/components/sync_driver/shared_change_processor_unittest.cc
@@ -20,7 +20,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 namespace {
 
@@ -29,7 +29,7 @@ using ::testing::StrictMock;
 
 class SyncSharedChangeProcessorTest :
     public testing::Test,
-    public browser_sync::SyncApiComponentFactory {
+    public SyncApiComponentFactory {
  public:
   SyncSharedChangeProcessorTest() : backend_thread_("dbthread"),
                                     did_connect_(false) {}
@@ -142,4 +142,4 @@ TEST_F(SyncSharedChangeProcessorTest, Basic) {
 
 }  // namespace
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/sync_api_component_factory.h b/components/sync_driver/sync_api_component_factory.h
index 0ba2c5d..b548605 100644
--- a/components/sync_driver/sync_api_component_factory.h
+++ b/components/sync_driver/sync_api_component_factory.h
@@ -11,7 +11,7 @@
 #include "sync/api/syncable_service.h"
 #include "sync/internal_api/public/base/model_type.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 // This factory provides sync driver code with the model type specific sync/api
 // service (like SyncableService) implementations.
@@ -36,6 +36,6 @@ class SyncApiComponentFactory {
       syncer::AttachmentService::Delegate* delegate) = 0;
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_SYNC_API_COMPONENT_FACTORY_H_
diff --git a/components/sync_driver/sync_frontend.cc b/components/sync_driver/sync_frontend.cc
index 33a76c1..7ea84e1 100644
--- a/components/sync_driver/sync_frontend.cc
+++ b/components/sync_driver/sync_frontend.cc
@@ -4,10 +4,10 @@
 
 #include "components/sync_driver/sync_frontend.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 SyncFrontend::SyncFrontend() {}
 
 SyncFrontend::~SyncFrontend() {}
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/sync_frontend.h b/components/sync_driver/sync_frontend.h
index 247d215..fd40b30 100644
--- a/components/sync_driver/sync_frontend.h
+++ b/components/sync_driver/sync_frontend.h
@@ -25,7 +25,7 @@ namespace sync_pb {
 class EncryptedData;
 }  // namespace sync_pb
 
-namespace browser_sync {
+namespace sync_driver {
 
 // SyncFrontend is the interface used by SyncBackendHost to communicate with
 // the entity that created it and, presumably, is interested in sync-related
@@ -140,6 +140,6 @@ class SyncFrontend {
   virtual void OnActionableError(const syncer::SyncProtocolError& error) = 0;
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_SYNC_FRONTEND_H_
diff --git a/components/sync_driver/sync_prefs.cc b/components/sync_driver/sync_prefs.cc
index ff26f0a..5e1f29e 100644
--- a/components/sync_driver/sync_prefs.cc
+++ b/components/sync_driver/sync_prefs.cc
@@ -499,4 +499,4 @@ void SyncPrefs::ClearFirstSyncTime() {
   pref_service_->ClearPref(prefs::kSyncFirstSyncTime);
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/sync_prefs.h b/components/sync_driver/sync_prefs.h
index bb66301..d0bac28 100644
--- a/components/sync_driver/sync_prefs.h
+++ b/components/sync_driver/sync_prefs.h
@@ -180,6 +180,6 @@ class SyncPrefs : NON_EXPORTED_BASE(public base::NonThreadSafe),
   DISALLOW_COPY_AND_ASSIGN(SyncPrefs);
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_SYNC_PREFS_H_
diff --git a/components/sync_driver/sync_prefs_unittest.cc b/components/sync_driver/sync_prefs_unittest.cc
index 8f513ad1..683d55a 100644
--- a/components/sync_driver/sync_prefs_unittest.cc
+++ b/components/sync_driver/sync_prefs_unittest.cc
@@ -234,4 +234,4 @@ TEST_F(SyncPrefsTest, ClearPreferences) {
 
 }  // namespace
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/system_encryptor.cc b/components/sync_driver/system_encryptor.cc
index 53eaa96..083227f 100644
--- a/components/sync_driver/system_encryptor.cc
+++ b/components/sync_driver/system_encryptor.cc
@@ -6,7 +6,7 @@
 
 #include "components/os_crypt/os_crypt.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 SystemEncryptor::~SystemEncryptor() {}
 
@@ -20,4 +20,4 @@ bool SystemEncryptor::DecryptString(const std::string& ciphertext,
   return ::OSCrypt::DecryptString(ciphertext, plaintext);
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/system_encryptor.h b/components/sync_driver/system_encryptor.h
index 5552b76..1b5c30f 100644
--- a/components/sync_driver/system_encryptor.h
+++ b/components/sync_driver/system_encryptor.h
@@ -8,7 +8,7 @@
 #include "base/compiler_specific.h"
 #include "sync/util/encryptor.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 // Encryptor that uses the Chrome password manager's encryptor.
 class SystemEncryptor : public syncer::Encryptor {
@@ -22,6 +22,6 @@ class SystemEncryptor : public syncer::Encryptor {
                              std::string* plaintext) OVERRIDE;
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_SYSTEM_ENCRYPTOR_H_
diff --git a/components/sync_driver/system_encryptor_unittest.cc b/components/sync_driver/system_encryptor_unittest.cc
index cee22c0..f4f73a3 100644
--- a/components/sync_driver/system_encryptor_unittest.cc
+++ b/components/sync_driver/system_encryptor_unittest.cc
@@ -7,7 +7,7 @@
 #include "components/os_crypt/os_crypt.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 namespace {
 
@@ -34,4 +34,4 @@ TEST_F(SystemEncryptorTest, EncryptDecrypt) {
 
 }  // namespace
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/ui_data_type_controller.cc b/components/sync_driver/ui_data_type_controller.cc
index 4caa59c..edfe452 100644
--- a/components/sync_driver/ui_data_type_controller.cc
+++ b/components/sync_driver/ui_data_type_controller.cc
@@ -13,7 +13,7 @@
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/util/data_type_histogram.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 UIDataTypeController::UIDataTypeController()
     : DataTypeController(base::MessageLoopProxy::current(),
@@ -351,4 +351,4 @@ void UIDataTypeController::RecordStartFailure(StartResult result) {
 #undef PER_DATA_TYPE_MACRO
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/ui_data_type_controller.h b/components/sync_driver/ui_data_type_controller.h
index c1b80a9..3d609a8 100644
--- a/components/sync_driver/ui_data_type_controller.h
+++ b/components/sync_driver/ui_data_type_controller.h
@@ -23,7 +23,7 @@ class SyncableService;
 class SyncError;
 }
 
-namespace browser_sync {
+namespace sync_driver {
 
 // Implementation for datatypes that reside on the (UI thread). This is the same
 // thread we perform initialization on, so we don't have to worry about thread
@@ -133,6 +133,6 @@ class UIDataTypeController : public DataTypeController {
   DISALLOW_COPY_AND_ASSIGN(UIDataTypeController);
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_UI_DATA_TYPE_CONTROLLER_H_
diff --git a/components/sync_driver/ui_data_type_controller_unittest.cc b/components/sync_driver/ui_data_type_controller_unittest.cc
index 5185692..46d635b 100644
--- a/components/sync_driver/ui_data_type_controller_unittest.cc
+++ b/components/sync_driver/ui_data_type_controller_unittest.cc
@@ -18,7 +18,7 @@ using testing::_;
 using testing::InvokeWithoutArgs;
 using testing::Return;
 
-namespace browser_sync {
+namespace sync_driver {
 namespace {
 
 // TODO(zea): Expand this to make the dtc type paramterizable. This will let us
@@ -204,4 +204,4 @@ TEST_F(SyncUIDataTypeControllerTest, OnSingleDatatypeUnrecoverableError) {
 }
 
 }  // namespace
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/components/sync_driver/user_selectable_sync_type.h b/components/sync_driver/user_selectable_sync_type.h
index 77e87df..59c1b18 100644
--- a/components/sync_driver/user_selectable_sync_type.h
+++ b/components/sync_driver/user_selectable_sync_type.h
@@ -5,7 +5,7 @@
 #ifndef COMPONENTS_SYNC_DRIVER_USER_SELECTABLE_SYNC_TYPE_H_
 #define COMPONENTS_SYNC_DRIVER_USER_SELECTABLE_SYNC_TYPE_H_
 
-namespace browser_sync {
+namespace sync_driver {
 namespace user_selectable_type {
 
 // An enumeration of the sync datatypes that are explicitly exposed to the user
@@ -61,6 +61,6 @@ enum UserSelectableSyncType {
 };
 
 }  // namespace user_selectable_type
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_USER_SELECTABLE_SYNC_TYPE_H_