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

components/browser_sync/abstract_profile_sync_service_test.cc

Index: components/browser_sync/abstract_profile_sync_service_test.cc
diff --git a/components/browser_sync/abstract_profile_sync_service_test.cc b/components/browser_sync/abstract_profile_sync_service_test.cc
index c1def134bb671d30f74af0198e7761d256c8b23d..f59512c7bda34bf7b72d47266de7e7cbb79ae73e 100644
--- a/components/browser_sync/abstract_profile_sync_service_test.cc
+++ b/components/browser_sync/abstract_profile_sync_service_test.cc
@@ -22,7 +22,6 @@
 #include "components/sync/protocol/sync.pb.h"
 #include "google_apis/gaia/gaia_constants.h"
 
-using syncer::SyncBackendHostImpl;
 using syncer::ModelType;
 using testing::_;
 using testing::Return;
@@ -35,10 +34,10 @@ class SyncBackendHostForProfileSyncTest : public SyncBackendHostImpl {
  public:
   SyncBackendHostForProfileSyncTest(
       const base::FilePath& temp_dir,
-      syncer::SyncClient* sync_client,
+      sync_driver::SyncClient* sync_client,
       const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread,
       invalidation::InvalidationService* invalidator,
-      const base::WeakPtr<syncer::SyncPrefs>& sync_prefs,
+      const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,
       const base::Closure& callback);
   ~SyncBackendHostForProfileSyncTest() override;
 
@@ -55,7 +54,7 @@ class SyncBackendHostForProfileSyncTest : public SyncBackendHostImpl {
       const base::Closure& retry_callback) override;
 
  protected:
-  void InitCore(std::unique_ptr<syncer::DoInitializeOptions> options) override;
+  void InitCore(std::unique_ptr<DoInitializeOptions> options) override;
 
  private:
   // Invoked at the start of HandleSyncManagerInitializationOnFrontendLoop.
@@ -68,10 +67,10 @@ class SyncBackendHostForProfileSyncTest : public SyncBackendHostImpl {
 
 SyncBackendHostForProfileSyncTest::SyncBackendHostForProfileSyncTest(
     const base::FilePath& temp_dir,
-    syncer::SyncClient* sync_client,
+    sync_driver::SyncClient* sync_client,
     const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread,
     invalidation::InvalidationService* invalidator,
-    const base::WeakPtr<syncer::SyncPrefs>& sync_prefs,
+    const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,
     const base::Closure& callback)
     : SyncBackendHostImpl(
           "dummy_debug_name",
@@ -85,7 +84,7 @@ SyncBackendHostForProfileSyncTest::SyncBackendHostForProfileSyncTest(
 SyncBackendHostForProfileSyncTest::~SyncBackendHostForProfileSyncTest() {}
 
 void SyncBackendHostForProfileSyncTest::InitCore(
-    std::unique_ptr<syncer::DoInitializeOptions> options) {
+    std::unique_ptr<DoInitializeOptions> options) {
   options->http_bridge_factory =
       std::unique_ptr<syncer::HttpPostProviderFactory>(
           new TestHttpBridgeFactory());
@@ -138,7 +137,7 @@ void SyncBackendHostForProfileSyncTest::RequestConfigureSyncer(
 }
 
 // Helper function for return-type-upcasting of the callback.
-syncer::SyncService* GetSyncService(
+sync_driver::SyncService* GetSyncService(
     base::Callback<TestProfileSyncService*(void)> get_sync_service_callback) {
   return get_sync_service_callback.Run();
 }
@@ -185,7 +184,7 @@ bool AbstractProfileSyncServiceTest::CreateRoot(ModelType model_type) {
 }
 
 void AbstractProfileSyncServiceTest::CreateSyncService(
-    std::unique_ptr<syncer::SyncClient> sync_client,
+    std::unique_ptr<sync_driver::SyncClient> sync_client,
     const base::Closure& initialization_success_callback) {
   DCHECK(sync_client);
   ProfileSyncService::InitParams init_params =
@@ -194,7 +193,7 @@ void AbstractProfileSyncServiceTest::CreateSyncService(
   sync_service_ =
       base::MakeUnique<TestProfileSyncService>(std::move(init_params));
 
-  syncer::SyncApiComponentFactoryMock* components =
+  SyncApiComponentFactoryMock* components =
       profile_sync_service_bundle_.component_factory();
   EXPECT_CALL(*components, CreateSyncBackendHost(_, _, _, _))
       .WillOnce(Return(new SyncBackendHostForProfileSyncTest(
@@ -207,7 +206,7 @@ void AbstractProfileSyncServiceTest::CreateSyncService(
   sync_service_->SetFirstSetupComplete();
 }
 
-base::Callback<syncer::SyncService*(void)>
+base::Callback<sync_driver::SyncService*(void)>
 AbstractProfileSyncServiceTest::GetSyncServiceCallback() {
   return base::Bind(GetSyncService,
                     base::Bind(&AbstractProfileSyncServiceTest::sync_service,