[Sync] Move conflict resolution test code to FakeModelTypeService.

components/sync/core/shared_model_type_processor_unittest.cc

Index: components/sync/core/shared_model_type_processor_unittest.cc
diff --git a/components/sync/core/shared_model_type_processor_unittest.cc b/components/sync/core/shared_model_type_processor_unittest.cc
index a5ee1dc1187b130e219e68e835ec9722f1956d39..1667a499710b3c187e943596b20f9acd15bb4bd7 100644
--- a/components/sync/core/shared_model_type_processor_unittest.cc
+++ b/components/sync/core/shared_model_type_processor_unittest.cc
@@ -176,12 +176,6 @@ class SharedModelTypeProcessorTest : public ::testing::Test,
     return type_processor()->entities_.size();
   }
 
-  // Store a resolution for the next call to ResolveConflict. Note that if this
-  // is a USE_NEW resolution, the data will only exist for one resolve call.
-  void SetConflictResolution(ConflictResolution resolution) {
-    conflict_resolution_.reset(new ConflictResolution(std::move(resolution)));
-  }
-
   // Sets the error type that OnReadyToConnect (our StartCallback) expects to
   // receive.
   void ExpectStartError(syncer::SyncError::ErrorType error_type) {
@@ -249,15 +243,6 @@ class SharedModelTypeProcessorTest : public ::testing::Test,
                          base::Unretained(this), callback));
   }
 
-  ConflictResolution ResolveConflict(
-      const EntityData& local_data,
-      const EntityData& remote_data) const override {
-    DCHECK(conflict_resolution_);
-    return std::move(*conflict_resolution_);
-  }
-
-  std::unique_ptr<ConflictResolution> conflict_resolution_;
-
   // This sets ThreadTaskRunnerHandle on the current thread, which the type
   // processor will pick up as the sync task runner.
   base::MessageLoop sync_loop_;