[SyncFS] Drop manual conflict resolution policy support.

chrome/browser/sync_file_system/sync_file_system_service.cc

 // 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.
 
 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/format_macros.h"
@@ skipping 330 matching lines @@
   // It's possible to get an invalid FileEntry.
   if (!url.is_valid()) {
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE,
         base::Bind(callback,
                    SYNC_FILE_ERROR_INVALID_URL,
                    SYNC_FILE_STATUS_UNKNOWN));
     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,
                  AsWeakPtr(), callback));
 }
 
 void SyncFileSystemService::AddSyncEventObserver(SyncEventObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void SyncFileSystemService::RemoveSyncEventObserver(
     SyncEventObserver* observer) {
   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();
 }
 
 SyncFileSystemService::SyncFileSystemService(Profile* profile)
     : profile_(profile),
       sync_enabled_(true) {
 }
 
@@ skipping 399 matching lines @@
   if (!v2_remote_service_) {
     v2_remote_service_ = RemoteFileSyncService::CreateForBrowserContext(
         RemoteFileSyncService::V2, profile_);
     scoped_ptr<RemoteSyncRunner> v2_remote_syncer(
         new RemoteSyncRunner(kRemoteSyncNameV2, this,
                              v2_remote_service_.get()));
     v2_remote_service_->AddServiceObserver(v2_remote_syncer.get());
     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();
 }
 
 }  // namespace sync_file_system