Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co

components/browser_sync/profile_sync_test_util.cc

Index: components/browser_sync/profile_sync_test_util.cc
diff --git a/components/browser_sync/profile_sync_test_util.cc b/components/browser_sync/profile_sync_test_util.cc
index 1732fcda728e642fffe2d6b998f76d259fcdb1bb..e49cdd3eef014ea55c01316425693327a8b6e6f3 100644
--- a/components/browser_sync/profile_sync_test_util.cc
+++ b/components/browser_sync/profile_sync_test_util.cc
@@ -22,15 +22,15 @@ namespace browser_sync {
 
 namespace {
 
-class BundleSyncClient : public syncer::FakeSyncClient {
+class BundleSyncClient : public sync_driver::FakeSyncClient {
  public:
-  BundleSyncClient(syncer::SyncApiComponentFactory* factory,
+  BundleSyncClient(sync_driver::SyncApiComponentFactory* factory,
                    PrefService* pref_service,
                    sync_sessions::SyncSessionsClient* sync_sessions_client,
                    autofill::PersonalDataManager* personal_data_manager,
                    const base::Callback<base::WeakPtr<syncer::SyncableService>(
                        syncer::ModelType type)>& get_syncable_service_callback,
-                   const base::Callback<syncer::SyncService*(void)>&
+                   const base::Callback<sync_driver::SyncService*(void)>&
                        get_sync_service_callback,
                    const base::Callback<bookmarks::BookmarkModel*(void)>&
                        get_bookmark_model_callback,
@@ -45,7 +45,7 @@ class BundleSyncClient : public syncer::FakeSyncClient {
   autofill::PersonalDataManager* GetPersonalDataManager() override;
   base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
       syncer::ModelType type) override;
-  syncer::SyncService* GetSyncService() override;
+  sync_driver::SyncService* GetSyncService() override;
   scoped_refptr<syncer::ModelSafeWorker> CreateModelWorkerForGroup(
       syncer::ModelSafeGroup group,
       syncer::WorkerLoopDestructionObserver* observer) override;
@@ -59,7 +59,8 @@ class BundleSyncClient : public syncer::FakeSyncClient {
   const base::Callback<base::WeakPtr<syncer::SyncableService>(
       syncer::ModelType type)>
       get_syncable_service_callback_;
-  const base::Callback<syncer::SyncService*(void)> get_sync_service_callback_;
+  const base::Callback<sync_driver::SyncService*(void)>
+      get_sync_service_callback_;
   const base::Callback<bookmarks::BookmarkModel*(void)>
       get_bookmark_model_callback_;
   // These task runners, if not null, are used in CreateModelWorkerForGroup.
@@ -69,19 +70,20 @@ class BundleSyncClient : public syncer::FakeSyncClient {
 };
 
 BundleSyncClient::BundleSyncClient(
-    syncer::SyncApiComponentFactory* factory,
+    sync_driver::SyncApiComponentFactory* factory,
     PrefService* pref_service,
     sync_sessions::SyncSessionsClient* sync_sessions_client,
     autofill::PersonalDataManager* personal_data_manager,
     const base::Callback<base::WeakPtr<syncer::SyncableService>(
         syncer::ModelType type)>& get_syncable_service_callback,
-    const base::Callback<syncer::SyncService*(void)>& get_sync_service_callback,
+    const base::Callback<sync_driver::SyncService*(void)>&
+        get_sync_service_callback,
     const base::Callback<bookmarks::BookmarkModel*(void)>&
         get_bookmark_model_callback,
     scoped_refptr<base::SingleThreadTaskRunner> db_thread,
     scoped_refptr<base::SingleThreadTaskRunner> file_thread,
     history::HistoryService* history_service)
-    : syncer::FakeSyncClient(factory),
+    : sync_driver::FakeSyncClient(factory),
       pref_service_(pref_service),
       sync_sessions_client_(sync_sessions_client),
       personal_data_manager_(personal_data_manager),
@@ -111,13 +113,13 @@ autofill::PersonalDataManager* BundleSyncClient::GetPersonalDataManager() {
 base::WeakPtr<syncer::SyncableService>
 BundleSyncClient::GetSyncableServiceForType(syncer::ModelType type) {
   if (get_syncable_service_callback_.is_null())
-    return syncer::FakeSyncClient::GetSyncableServiceForType(type);
+    return sync_driver::FakeSyncClient::GetSyncableServiceForType(type);
   return get_syncable_service_callback_.Run(type);
 }
 
-syncer::SyncService* BundleSyncClient::GetSyncService() {
+sync_driver::SyncService* BundleSyncClient::GetSyncService() {
   if (get_sync_service_callback_.is_null())
-    return syncer::FakeSyncClient::GetSyncService();
+    return sync_driver::FakeSyncClient::GetSyncService();
   return get_sync_service_callback_.Run();
 }
 
@@ -130,14 +132,13 @@ BundleSyncClient::CreateModelWorkerForGroup(
   DCHECK(file_thread_) << "DB thread was specified but FILE thread was not.";
   switch (group) {
     case syncer::GROUP_DB:
-      return new syncer::BrowserThreadModelWorker(db_thread_, syncer::GROUP_DB,
-                                                  observer);
+      return new BrowserThreadModelWorker(db_thread_, syncer::GROUP_DB,
+                                          observer);
     case syncer::GROUP_FILE:
-      return new syncer::BrowserThreadModelWorker(file_thread_,
-                                                  syncer::GROUP_FILE, observer);
+      return new BrowserThreadModelWorker(file_thread_, syncer::GROUP_FILE,
+                                          observer);
     case syncer::GROUP_UI:
-      return new syncer::UIModelWorker(base::ThreadTaskRunnerHandle::Get(),
-                                       observer);
+      return new UIModelWorker(base::ThreadTaskRunnerHandle::Get(), observer);
     case syncer::GROUP_PASSIVE:
       return new syncer::PassiveModelWorker(observer);
     case syncer::GROUP_HISTORY: {
@@ -173,7 +174,7 @@ void EmptyNetworkTimeUpdate(const base::Time&,
 
 void RegisterPrefsForProfileSyncService(
     user_prefs::PrefRegistrySyncable* registry) {
-  syncer::SyncPrefs::RegisterProfilePrefs(registry);
+  sync_driver::SyncPrefs::RegisterProfilePrefs(registry);
   AccountTrackerService::RegisterPrefs(registry);
   SigninManagerBase::RegisterProfilePrefs(registry);
   SigninManagerBase::RegisterPrefs(registry);
@@ -199,7 +200,7 @@ void ProfileSyncServiceBundle::SyncClientBuilder::SetSyncableServiceCallback(
 
 // The client will call this callback to produce the service.
 void ProfileSyncServiceBundle::SyncClientBuilder::SetSyncServiceCallback(
-    const base::Callback<syncer::SyncService*(void)>&
+    const base::Callback<sync_driver::SyncService*(void)>&
         get_sync_service_callback) {
   get_sync_service_callback_ = get_sync_service_callback;
 }
@@ -215,7 +216,7 @@ void ProfileSyncServiceBundle::SyncClientBuilder::SetBookmarkModelCallback(
   get_bookmark_model_callback_ = get_bookmark_model_callback;
 }
 
-std::unique_ptr<syncer::FakeSyncClient>
+std::unique_ptr<sync_driver::FakeSyncClient>
 ProfileSyncServiceBundle::SyncClientBuilder::Build() {
   return base::MakeUnique<BundleSyncClient>(
       bundle_->component_factory(), bundle_->pref_service(),
@@ -251,7 +252,7 @@ ProfileSyncServiceBundle::~ProfileSyncServiceBundle() {}
 
 ProfileSyncService::InitParams ProfileSyncServiceBundle::CreateBasicInitParams(
     ProfileSyncService::StartBehavior start_behavior,
-    std::unique_ptr<syncer::SyncClient> sync_client) {
+    std::unique_ptr<sync_driver::SyncClient> sync_client) {
   ProfileSyncService::InitParams init_params;
 
   init_params.start_behavior = start_behavior;