[SyncFS] Drop manual conflict resolution policy support.

chrome/browser/sync_file_system/mock_remote_file_sync_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/mock_remote_file_sync_service.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 17 matching lines @@
       .WillByDefault(Invoke(this, &self::AddFileStatusObserverStub));
   ON_CALL(*this, RegisterOrigin(_, _))
       .WillByDefault(Invoke(this, &self::RegisterOriginStub));
   ON_CALL(*this, UninstallOrigin(_, _, _))
       .WillByDefault(
           Invoke(this, &self::DeleteOriginDirectoryStub));
   ON_CALL(*this, ProcessRemoteChange(_))
       .WillByDefault(Invoke(this, &self::ProcessRemoteChangeStub));
   ON_CALL(*this, GetLocalChangeProcessor())
       .WillByDefault(Return(&mock_local_change_processor_));
-  ON_CALL(*this, IsConflicting(_))
-      .WillByDefault(Return(false));
   ON_CALL(*this, GetCurrentState())
       .WillByDefault(Invoke(this, &self::GetCurrentStateStub));
-  ON_CALL(*this, SetDefaultConflictResolutionPolicy(_))
-      .WillByDefault(
-          Invoke(this, &self::SetDefaultConflictResolutionPolicyStub));
-  ON_CALL(*this, SetConflictResolutionPolicy(_, _))
-      .WillByDefault(Invoke(this, &self::SetConflictResolutionPolicyStub));
-  ON_CALL(*this, GetDefaultConflictResolutionPolicy())
-      .WillByDefault(
-          Invoke(this, &self::GetDefaultConflictResolutionPolicyStub));
-  ON_CALL(*this, GetConflictResolutionPolicy(_))
-      .WillByDefault(Invoke(this, &self::GetConflictResolutionPolicyStub));
 }
 
 MockRemoteFileSyncService::~MockRemoteFileSyncService() {
 }
 
 void MockRemoteFileSyncService::DumpFiles(const GURL& origin,
                                           const ListCallback& callback) {
   callback.Run(scoped_ptr<base::ListValue>());
 }
 
@@ skipping 55 matching lines @@
 }
 
 void MockRemoteFileSyncService::ProcessRemoteChangeStub(
     const SyncFileCallback& callback) {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
       base::Bind(callback, SYNC_STATUS_NO_CHANGE_TO_SYNC,
                  fileapi::FileSystemURL()));
 }
 
-SyncStatusCode
-MockRemoteFileSyncService::SetDefaultConflictResolutionPolicyStub(
-    ConflictResolutionPolicy policy) {
-  conflict_resolution_policy_ = policy;
-  return SYNC_STATUS_OK;
-}
-
-SyncStatusCode MockRemoteFileSyncService::SetConflictResolutionPolicyStub(
-    const GURL& origin,
-    ConflictResolutionPolicy policy) {
-  conflict_resolution_policy_ = policy;
-  return SYNC_STATUS_OK;
-}
-
-ConflictResolutionPolicy
-MockRemoteFileSyncService::GetDefaultConflictResolutionPolicyStub() const {
-  return conflict_resolution_policy_;
-}
-
-ConflictResolutionPolicy
-MockRemoteFileSyncService::GetConflictResolutionPolicyStub(
-    const GURL& origin) const {
-  return conflict_resolution_policy_;
-}
-
 RemoteServiceState MockRemoteFileSyncService::GetCurrentStateStub() const {
   return state_;
 }
 
 }  // namespace sync_file_system