[SyncFS] Drop manual conflict resolution policy support.

chrome/browser/sync_file_system/remote_file_sync_service.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_REMOTE_FILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_REMOTE_FILE_SYNC_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 165 matching lines @@
 
   // Sets a remote change processor.  This must be called before any
   // ProcessRemoteChange().
   virtual void SetRemoteChangeProcessor(
       RemoteChangeProcessor* processor) = 0;
 
   // Returns a LocalChangeProcessor that applies a local change to the remote
   // 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;
 
   // Returns all origins along with an arbitrary string description of their
   // corresponding sync statuses.
   virtual void GetOriginStatusMap(OriginStatusMap* status_map) = 0;
 
   // Returns file metadata for |origin| to call |callback|.
   virtual void DumpFiles(const GURL& origin,
                          const ListCallback& callback) = 0;
 
   // Returns the dump of internal database.
   virtual void DumpDatabase(const ListCallback& callback) = 0;
 
   // Enables or disables the background sync.
   // Setting this to false should disable the synchronization (and make
   // the service state to REMOTE_SERVICE_DISABLED), while setting this to
   // true does not necessarily mean the service is actually turned on
   // (for example if Chrome is offline the service state will become
   // 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:
   DISALLOW_COPY_AND_ASSIGN(RemoteFileSyncService);
 };
 
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_REMOTE_FILE_SYNC_SERVICE_H_