[SyncFS] Drop manual conflict resolution policy support.

chrome/browser/sync_file_system/mock_remote_file_sync_service.cc

Index: chrome/browser/sync_file_system/mock_remote_file_sync_service.cc
diff --git a/chrome/browser/sync_file_system/mock_remote_file_sync_service.cc b/chrome/browser/sync_file_system/mock_remote_file_sync_service.cc
index ac28e5e2f62e7bd9391e80f1889837a5fa326726..db58a51845102062f6d2a0010f8e795e0541f75b 100644
--- a/chrome/browser/sync_file_system/mock_remote_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/mock_remote_file_sync_service.cc
@@ -35,20 +35,8 @@ MockRemoteFileSyncService::MockRemoteFileSyncService()
       .WillByDefault(Invoke(this, &self::ProcessRemoteChangeStub));
   ON_CALL(*this, GetLocalChangeProcessor())
       .WillByDefault(Return(&mock_local_change_processor_));
-  ON_CALL(*this, IsConflicting(_))
-      .WillByDefault(Return(false));
   ON_CALL(*this, GetCurrentState())
       .WillByDefault(Invoke(this, &self::GetCurrentStateStub));
-  ON_CALL(*this, SetDefaultConflictResolutionPolicy(_))
-      .WillByDefault(
-          Invoke(this, &self::SetDefaultConflictResolutionPolicyStub));
-  ON_CALL(*this, SetConflictResolutionPolicy(_, _))
-      .WillByDefault(Invoke(this, &self::SetConflictResolutionPolicyStub));
-  ON_CALL(*this, GetDefaultConflictResolutionPolicy())
-      .WillByDefault(
-          Invoke(this, &self::GetDefaultConflictResolutionPolicyStub));
-  ON_CALL(*this, GetConflictResolutionPolicy(_))
-      .WillByDefault(Invoke(this, &self::GetConflictResolutionPolicyStub));
 }
 
 MockRemoteFileSyncService::~MockRemoteFileSyncService() {
@@ -124,31 +112,6 @@ void MockRemoteFileSyncService::ProcessRemoteChangeStub(
                  fileapi::FileSystemURL()));
 }
 
-SyncStatusCode
-MockRemoteFileSyncService::SetDefaultConflictResolutionPolicyStub(
-    ConflictResolutionPolicy policy) {
-  conflict_resolution_policy_ = policy;
-  return SYNC_STATUS_OK;
-}
-
-SyncStatusCode MockRemoteFileSyncService::SetConflictResolutionPolicyStub(
-    const GURL& origin,
-    ConflictResolutionPolicy policy) {
-  conflict_resolution_policy_ = policy;
-  return SYNC_STATUS_OK;
-}
-
-ConflictResolutionPolicy
-MockRemoteFileSyncService::GetDefaultConflictResolutionPolicyStub() const {
-  return conflict_resolution_policy_;
-}
-
-ConflictResolutionPolicy
-MockRemoteFileSyncService::GetConflictResolutionPolicyStub(
-    const GURL& origin) const {
-  return conflict_resolution_policy_;
-}
-
 RemoteServiceState MockRemoteFileSyncService::GetCurrentStateStub() const {
   return state_;
 }