[SyncFS] Drop manual conflict resolution policy support.

chrome/browser/sync_file_system/drive_backend/sync_engine.cc

Index: chrome/browser/sync_file_system/drive_backend/sync_engine.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
index f4fe30d4309361f4ddbd9ab48c40d13ae25a0066..c02c43b36df43e13377596fb9b6cf4943b367b1c 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
@@ -340,11 +340,6 @@ LocalChangeProcessor* SyncEngine::GetLocalChangeProcessor() {
   return this;
 }
 
-bool SyncEngine::IsConflicting(const fileapi::FileSystemURL& url) {
-  // TODO(tzik): Implement this before we support manual conflict resolution.
-  return false;
-}
-
 RemoteServiceState SyncEngine::GetCurrentState() const {
   return service_state_;
 }
@@ -382,46 +377,6 @@ void SyncEngine::SetSyncEnabled(bool enabled) {
                  enabled));
 }
 
-SyncStatusCode SyncEngine::SetDefaultConflictResolutionPolicy(
-    ConflictResolutionPolicy policy) {
-  // TODO(peria): Make this route asynchronous.
-  return sync_worker_->SetDefaultConflictResolutionPolicy(policy);
-}
-
-SyncStatusCode SyncEngine::SetConflictResolutionPolicy(
-    const GURL& origin,
-    ConflictResolutionPolicy policy) {
-  // TODO(peria): Make this route asynchronous.
-  return sync_worker_->SetConflictResolutionPolicy(origin, policy);
-}
-
-ConflictResolutionPolicy SyncEngine::GetDefaultConflictResolutionPolicy()
-    const {
-  // TODO(peria): Make this route asynchronous.
-  return sync_worker_->GetDefaultConflictResolutionPolicy();
-}
-
-ConflictResolutionPolicy SyncEngine::GetConflictResolutionPolicy(
-    const GURL& origin) const {
-  // TODO(peria): Make this route asynchronous.
-  return sync_worker_->GetConflictResolutionPolicy(origin);
-}
-
-void SyncEngine::GetRemoteVersions(
-    const fileapi::FileSystemURL& url,
-    const RemoteVersionsCallback& callback) {
-  // TODO(tzik): Implement this before we support manual conflict resolution.
-  callback.Run(SYNC_STATUS_FAILED, std::vector<Version>());
-}
-
-void SyncEngine::DownloadRemoteVersion(
-    const fileapi::FileSystemURL& url,
-    const std::string& version_id,
-    const DownloadVersionCallback& callback) {
-  // TODO(tzik): Implement this before we support manual conflict resolution.
-  callback.Run(SYNC_STATUS_FAILED, webkit_blob::ScopedFile());
-}
-
 void SyncEngine::PromoteDemotedChanges() {
   MetadataDatabase* metadata_db = GetMetadataDatabase();
   if (metadata_db && metadata_db->HasLowPriorityDirtyTracker()) {