[SyncFS] Drop manual conflict resolution policy support.

chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h

Index: chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h
diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h
index 08015c7f2b2c29a64fff6cbf8962774dea59ea4d..c007f8ba8939c57ce797223cefc8734c22fb61af 100644
--- a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h
+++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h
@@ -97,29 +97,12 @@ class DriveFileSyncService : public RemoteFileSyncService,
   virtual void SetRemoteChangeProcessor(
       RemoteChangeProcessor* processor) OVERRIDE;
   virtual LocalChangeProcessor* GetLocalChangeProcessor() OVERRIDE;
-  virtual bool IsConflicting(const fileapi::FileSystemURL& url) OVERRIDE;
   virtual RemoteServiceState GetCurrentState() const OVERRIDE;
   virtual void GetOriginStatusMap(OriginStatusMap* status_map) OVERRIDE;
   virtual void DumpFiles(const GURL& origin,
                          const ListCallback& callback) OVERRIDE;
   virtual void DumpDatabase(const ListCallback& callback) OVERRIDE;
   virtual void SetSyncEnabled(bool enabled) OVERRIDE;
-  virtual SyncStatusCode SetDefaultConflictResolutionPolicy(
-      ConflictResolutionPolicy policy) OVERRIDE;
-  virtual SyncStatusCode SetConflictResolutionPolicy(
-      const GURL& origin,
-      ConflictResolutionPolicy policy) OVERRIDE;
-  virtual ConflictResolutionPolicy GetDefaultConflictResolutionPolicy() const
-      OVERRIDE;
-  virtual ConflictResolutionPolicy GetConflictResolutionPolicy(
-      const GURL& origin) const OVERRIDE;
-  virtual void GetRemoteVersions(const fileapi::FileSystemURL& url,
-                                 const RemoteVersionsCallback& callback)
-      OVERRIDE;
-  virtual void DownloadRemoteVersion(
-      const fileapi::FileSystemURL& url,
-      const std::string& version_id,
-      const DownloadVersionCallback& callback) OVERRIDE;
   virtual void PromoteDemotedChanges() OVERRIDE;
 
   // LocalChangeProcessor overrides.
@@ -213,28 +196,6 @@ class DriveFileSyncService : public RemoteFileSyncService,
       const fileapi::FileSystemURL& url,
       const SyncStatusCallback& callback);
 
-  void DoGetRemoteVersions(
-      const fileapi::FileSystemURL& url,
-      const RemoteVersionsCallback& callback,
-      const SyncStatusCallback& completion_callback);
-  void DidGetEntryForRemoteVersions(
-      const RemoteVersionsCallback& callback,
-      google_apis::GDataErrorCode error,
-      scoped_ptr<google_apis::ResourceEntry> entry);
-
-  void DoDownloadRemoteVersion(
-      const fileapi::FileSystemURL& url,
-      const std::string& version_id,
-      const DownloadVersionCallback& callback,
-      const SyncStatusCallback& completion_callback);
-  void DidDownloadVersion(
-      const DownloadVersionCallback& download_callback,
-      google_apis::GDataErrorCode error,
-      const std::string& file_md5,
-      int64 file_size,
-      const base::Time& last_updated,
-      webkit_blob::ScopedFile downloaded);
-
   void UpdateRegisteredOrigins();
 
   void StartBatchSync(const SyncStatusCallback& callback);