[Sync] Move //components/sync to the syncer namespace, take 2.

chrome/browser/sync/test/integration/two_client_uss_sync_test.cc

 // Copyright 2016 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 "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/sync/chrome_sync_client.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/single_client_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/status_change_checker.h"
 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "components/browser_sync/profile_sync_components_factory_impl.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/sync/api/fake_model_type_service.h"
 
 using browser_sync::ChromeSyncClient;
 using browser_sync::ProfileSyncComponentsFactoryImpl;
-using syncer_v2::ConflictResolution;
-using syncer_v2::FakeModelTypeService;
-using syncer_v2::ModelTypeService;
-using syncer_v2::SharedModelTypeProcessor;
+using syncer::ConflictResolution;
+using syncer::FakeModelTypeService;
+using syncer::ModelTypeService;
+using syncer::SharedModelTypeProcessor;
 
 const char kKey1[] = "key1";
 const char kKey2[] = "key2";
 const char kValue1[] = "value1";
 const char kValue2[] = "value2";
 const char kValue3[] = "value3";
 
 // A ChromeSyncClient that provides a ModelTypeService for PREFERENCES.
 class TestSyncClient : public ChromeSyncClient {
  public:
@@ skipping 17 matching lines @@
   class Observer {
    public:
     virtual void OnApplySyncChanges() = 0;
   };
 
   TestModelTypeService()
       : FakeModelTypeService(
             base::Bind(&SharedModelTypeProcessor::CreateAsChangeProcessor)) {}
 
   syncer::SyncError ApplySyncChanges(
-      std::unique_ptr<syncer_v2::MetadataChangeList> metadata_changes,
-      syncer_v2::EntityChangeList entity_changes) override {
+      std::unique_ptr<syncer::MetadataChangeList> metadata_changes,
+      syncer::EntityChangeList entity_changes) override {
     syncer::SyncError error = FakeModelTypeService::ApplySyncChanges(
         std::move(metadata_changes), entity_changes);
     NotifyObservers();
     return error;
   }
 
   void OnChangeProcessorSet() override {
     change_processor()->OnMetadataLoaded(syncer::SyncError(),
                                          db().CreateMetadataBatch());
   }
@@ skipping 127 matching lines @@
     ProfileSyncComponentsFactoryImpl::OverridePrefsForUssTest(false);
   }
 
   bool TestUsesSelfNotifications() override { return false; }
 
   TestModelTypeService* GetModelTypeService(int i) {
     return services_.at(i).get();
   }
 
  protected:
-  std::unique_ptr<sync_driver::SyncClient> CreateSyncClient(Profile* profile) {
+  std::unique_ptr<syncer::SyncClient> CreateSyncClient(Profile* profile) {
     if (!first_client_ignored_) {
       // The test infra creates a profile before the two made for sync tests.
       first_client_ignored_ = true;
       return base::MakeUnique<ChromeSyncClient>(profile);
     }
     auto service = base::MakeUnique<TestModelTypeService>();
     auto client = base::MakeUnique<TestSyncClient>(profile, service.get());
     clients_.push_back(client.get());
     services_.push_back(std::move(service));
     return std::move(client);
@@ skipping 97 matching lines @@
   model2->SetServiceError(syncer::SyncError::DATATYPE_ERROR);
   // Write an item on model 1 to trigger a GetUpdates in model 2.
   model1->WriteItem(kKey1, kValue2);
 
   // The type should stop syncing but keep tracking metadata.
   ASSERT_TRUE(PrefsNotRunningChecker(GetSyncService(1)).Wait());
   ASSERT_EQ(1U, model2->db().metadata_count());
   model2->WriteItem(kKey2, kValue2);
   ASSERT_EQ(2U, model2->db().metadata_count());
 }