[SyncFS] Drop manual conflict resolution policy support.

chrome/browser/sync_file_system/sync_file_system_service.cc

Index: chrome/browser/sync_file_system/sync_file_system_service.cc
diff --git a/chrome/browser/sync_file_system/sync_file_system_service.cc b/chrome/browser/sync_file_system/sync_file_system_service.cc
index 8fb7b71750986440e968d47b60324e708b6a7e27..96658baa14f995b8ade5e9ece34c43e8727a9a95 100644
--- a/chrome/browser/sync_file_system/sync_file_system_service.cc
+++ b/chrome/browser/sync_file_system/sync_file_system_service.cc
@@ -348,15 +348,6 @@ void SyncFileSystemService::GetFileSyncStatus(
     return;
   }
 
-  if (GetRemoteService(url.origin())->IsConflicting(url)) {
-    base::MessageLoopProxy::current()->PostTask(
-        FROM_HERE,
-        base::Bind(callback,
-                   SYNC_STATUS_OK,
-                   SYNC_FILE_STATUS_CONFLICTING));
-    return;
-  }
-
   local_service_->HasPendingLocalChanges(
       url,
       base::Bind(&SyncFileSystemService::DidGetLocalChangeStatus,
@@ -372,19 +363,6 @@ void SyncFileSystemService::RemoveSyncEventObserver(
   observers_.RemoveObserver(observer);
 }
 
-ConflictResolutionPolicy SyncFileSystemService::GetConflictResolutionPolicy(
-    const GURL& origin) {
-  return GetRemoteService(origin)->GetConflictResolutionPolicy(origin);
-}
-
-SyncStatusCode SyncFileSystemService::SetConflictResolutionPolicy(
-    const GURL& origin,
-    ConflictResolutionPolicy policy) {
-  UMA_HISTOGRAM_ENUMERATION("SyncFileSystem.ConflictResolutionPolicy",
-                            policy, CONFLICT_RESOLUTION_POLICY_MAX);
-  return GetRemoteService(origin)->SetConflictResolutionPolicy(origin, policy);
-}
-
 LocalChangeProcessor* SyncFileSystemService::GetLocalChangeProcessor(
     const GURL& origin) {
   return GetRemoteService(origin)->GetLocalChangeProcessor();
@@ -804,8 +782,6 @@ RemoteFileSyncService* SyncFileSystemService::GetRemoteService(
     v2_remote_service_->AddFileStatusObserver(this);
     v2_remote_service_->SetRemoteChangeProcessor(local_service_.get());
     v2_remote_service_->SetSyncEnabled(sync_enabled_);
-    v2_remote_service_->SetDefaultConflictResolutionPolicy(
-        remote_service_->GetDefaultConflictResolutionPolicy());
     remote_sync_runners_.push_back(v2_remote_syncer.release());
   }
   return v2_remote_service_.get();