[Sync] Move conflict resolution test code to FakeModelTypeService.

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/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;
 
 const char kKey1[] = "key1";
 const char kValue1[] = "value1";
 const char kValue2[] = "value2";
-const char kResolutionValue[] = "RESOLVED";
+const char kValue3[] = "value3";
 
 // A ChromeSyncClient that provides a ModelTypeService for PREFERENCES.
 class TestSyncClient : public ChromeSyncClient {
  public:
   TestSyncClient(Profile* profile, ModelTypeService* service)
       : ChromeSyncClient(profile), service_(service) {}
 
   base::WeakPtr<ModelTypeService> GetModelTypeServiceForType(
       syncer::ModelType type) override {
     return type == syncer::PREFERENCES
@@ skipping 24 matching lines @@
         std::move(metadata_changes), entity_changes);
     NotifyObservers();
     return error;
   }
 
   void OnChangeProcessorSet() override {
     change_processor()->OnMetadataLoaded(syncer::SyncError(),
                                          db().CreateMetadataBatch());
   }
 
-  syncer_v2::ConflictResolution ResolveConflict(
-      const syncer_v2::EntityData& local_data,
-      const syncer_v2::EntityData& remote_data) const override {
-    return syncer_v2::ConflictResolution::UseNew(
-        GenerateEntityData(local_data.non_unique_name, kResolutionValue));
-  }
-
   void AddObserver(Observer* observer) { observers_.insert(observer); }
   void RemoveObserver(Observer* observer) { observers_.erase(observer); }
 
  private:
   void NotifyObservers() {
     for (Observer* observer : observers_) {
       observer->OnApplySyncChanges();
     }
   }
 
@@ skipping 197 matching lines @@
   ASSERT_EQ(1U, model1->db().data_count());
   ASSERT_EQ(1U, model1->db().metadata_count());
   ASSERT_EQ(1U, model2->db().data_count());
   ASSERT_EQ(1U, model2->db().metadata_count());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientUssSyncTest, ConflictResolution) {
   ASSERT_TRUE(SetupSync());
   TestModelTypeService* model1 = GetModelTypeService(0);
   TestModelTypeService* model2 = GetModelTypeService(1);
+  model1->SetConflictResolution(ConflictResolution::UseNew(
+      FakeModelTypeService::GenerateEntityData(kKey1, kValue3)));
+  model2->SetConflictResolution(ConflictResolution::UseNew(
+      FakeModelTypeService::GenerateEntityData(kKey1, kValue3)));
 
   // Write conflicting entities.
   model1->WriteItem(kKey1, kValue1);
   model2->WriteItem(kKey1, kValue2);
 
   // Wait for them to be resolved to kResolutionValue by the custom conflict
   // resolution logic in TestModelTypeService.
-  ASSERT_TRUE(DataChecker(model1, kKey1, kResolutionValue).Wait());
-  ASSERT_TRUE(DataChecker(model2, kKey1, kResolutionValue).Wait());
+  ASSERT_TRUE(DataChecker(model1, kKey1, kValue3).Wait());
+  ASSERT_TRUE(DataChecker(model2, kKey1, kValue3).Wait());
 }