[SyncFS] Drop manual conflict resolution policy support.

chrome/browser/sync_file_system/remote_file_sync_service.h

Index: chrome/browser/sync_file_system/remote_file_sync_service.h
diff --git a/chrome/browser/sync_file_system/remote_file_sync_service.h b/chrome/browser/sync_file_system/remote_file_sync_service.h
index 8a310548f4c6f122c828809ab80bb3c360d5913d..710a3ed15108444e100a411703762624e2729653 100644
--- a/chrome/browser/sync_file_system/remote_file_sync_service.h
+++ b/chrome/browser/sync_file_system/remote_file_sync_service.h
@@ -183,9 +183,6 @@ class RemoteFileSyncService {
   // storage backed by this service.
   virtual LocalChangeProcessor* GetLocalChangeProcessor() = 0;
 
-  // Returns true if the file |url| is marked conflicted in the remote service.
-  virtual bool IsConflicting(const fileapi::FileSystemURL& url) = 0;
-
   // Returns the current remote service state (should equal to the value
   // returned by the last OnRemoteServiceStateUpdated notification.
   virtual RemoteServiceState GetCurrentState() const = 0;
@@ -209,34 +206,6 @@ class RemoteFileSyncService {
   // REMOTE_SERVICE_TEMPORARY_UNAVAILABLE).
   virtual void SetSyncEnabled(bool enabled) = 0;
 
-  // Sets the conflict resolution policy. Returns SYNC_STATUS_OK on success,
-  // or returns an error code if the given policy is not supported or had
-  // an error.
-  virtual SyncStatusCode SetDefaultConflictResolutionPolicy(
-      ConflictResolutionPolicy policy) = 0;
-  virtual SyncStatusCode SetConflictResolutionPolicy(
-      const GURL& origin,
-      ConflictResolutionPolicy policy) = 0;
-
-  // Gets the conflict resolution policy.
-  virtual ConflictResolutionPolicy GetDefaultConflictResolutionPolicy()
-      const = 0;
-  virtual ConflictResolutionPolicy GetConflictResolutionPolicy(
-      const GURL& origin) const = 0;
-
-  // Returns a list of remote versions with their metadata.
-  // This method is typically called for a file which is in conflicting state.
-  virtual void GetRemoteVersions(
-      const fileapi::FileSystemURL& url,
-      const RemoteVersionsCallback& callback) = 0;
-
-  // Downloads the remote image.  The |id| should be the ID string for a
-  // version returned by GetRemoteVersions.
-  virtual void DownloadRemoteVersion(
-      const fileapi::FileSystemURL& url,
-      const std::string& id,
-      const DownloadVersionCallback& callback) = 0;
-
   virtual void PromoteDemotedChanges() = 0;
 
  private: