[SyncFS] Drop manual conflict resolution policy support.

chrome/browser/sync_file_system/drive_backend/sync_engine.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
@@ skipping 322 matching lines @@
       FROM_HERE,
       base::Bind(&SyncWorker::SetRemoteChangeProcessor,
                  base::Unretained(sync_worker_.get()),
                  remote_change_processor_on_worker_.get()));
 }
 
 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_;
 }
 
 void SyncEngine::GetOriginStatusMap(OriginStatusMap* status_map) {
   // TODO(peria): Make this route asynchronous.
   sync_worker_->GetOriginStatusMap(status_map);
 }
 
 void SyncEngine::DumpFiles(const GURL& origin,
@@ skipping 17 matching lines @@
 }
 
 void SyncEngine::SetSyncEnabled(bool enabled) {
   worker_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&SyncWorker::SetSyncEnabled,
                  base::Unretained(sync_worker_.get()),
                  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()) {
     metadata_db->PromoteLowerPriorityTrackersToNormal();
     FOR_EACH_OBSERVER(
         Observer,
         service_observers_,
         OnRemoteChangeQueueUpdated(metadata_db->CountDirtyTracker()));
   }
 }
@@ skipping 147 matching lines @@
         tracker.tracker_kind() == TRACKER_KIND_APP_ROOT;
     if (is_app_enabled && !is_app_root_tracker_enabled)
       EnableOrigin(origin, base::Bind(&EmptyStatusCallback));
     else if (!is_app_enabled && is_app_root_tracker_enabled)
       DisableOrigin(origin, base::Bind(&EmptyStatusCallback));
   }
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system