[Sync] Move conflict resolution test code to FakeModelTypeService.

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

Index: chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc b/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
index 0e46e7049f6f60c9c38c7b6bfba9ee781c3de781..af1eb01f6af3d1a08f58e4a375fb6c962d336df6 100644
--- a/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
@@ -17,6 +17,7 @@
 
 using browser_sync::ChromeSyncClient;
 using browser_sync::ProfileSyncComponentsFactoryImpl;
+using syncer_v2::ConflictResolution;
 using syncer_v2::FakeModelTypeService;
 using syncer_v2::ModelTypeService;
 using syncer_v2::SharedModelTypeProcessor;
@@ -69,13 +70,6 @@ class TestModelTypeService : public FakeModelTypeService {
                                          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); }
 
@@ -293,6 +287,10 @@ 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, kResolutionValue)));
+  model2->SetConflictResolution(ConflictResolution::UseNew(
+      FakeModelTypeService::GenerateEntityData(kKey1, kResolutionValue)));

[skym, 2016/09/26 18:16:04]

Should you write a test where they disagree?

[maxbogue, 2016/09/27 16:26:12]

I've run into some strange issues trying to add a second round of things and
I'll be investigating that separately.

 
   // Write conflicting entities.
   model1->WriteItem(kKey1, kValue1);