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

chrome/browser/sync/profile_sync_test_util.cc

 // Copyright (c) 2011 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 "chrome/browser/sync/profile_sync_test_util.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 10 matching lines @@
 #include "components/sync/driver/startup_controller.h"
 #include "components/sync/driver/sync_api_component_factory_mock.h"
 
 using browser_sync::ProfileSyncService;
 
 ProfileSyncService::InitParams CreateProfileSyncServiceParamsForTest(
     Profile* profile) {
   auto sync_client = base::MakeUnique<browser_sync::ChromeSyncClient>(profile);
 
   sync_client->SetSyncApiComponentFactoryForTesting(
-      base::MakeUnique<syncer::SyncApiComponentFactoryMock>());
+      base::MakeUnique<SyncApiComponentFactoryMock>());
 
   ProfileSyncService::InitParams init_params =
       CreateProfileSyncServiceParamsForTest(std::move(sync_client), profile);
 
   return init_params;
 }
 
 ProfileSyncService::InitParams CreateProfileSyncServiceParamsForTest(
-    std::unique_ptr<syncer::SyncClient> sync_client,
+    std::unique_ptr<sync_driver::SyncClient> sync_client,
     Profile* profile) {
   ProfileSyncService::InitParams init_params;
 
   init_params.signin_wrapper = base::MakeUnique<SigninManagerWrapper>(
       SigninManagerFactory::GetForProfile(profile));
   init_params.oauth2_token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
   init_params.start_behavior = ProfileSyncService::MANUAL_START;
   init_params.sync_client = std::move(sync_client);
   init_params.network_time_update_callback =
@@ skipping 17 matching lines @@
       ->SetAuthenticatedAccountInfo("12345", "foo");
   return profile;
 }
 
 std::unique_ptr<KeyedService> BuildMockProfileSyncService(
     content::BrowserContext* context) {
   return base::MakeUnique<browser_sync::ProfileSyncServiceMock>(
       CreateProfileSyncServiceParamsForTest(
           Profile::FromBrowserContext(context)));
 }