[SyncFS] Drop manual conflict resolution policy support.

chrome/browser/sync_file_system/mock_remote_file_sync_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_MOCK_REMOTE_FILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_MOCK_REMOTE_FILE_SYNC_SERVICE_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 29 matching lines @@
                void(const GURL& origin, const SyncStatusCallback& callback));
   MOCK_METHOD3(UninstallOrigin,
                void(const GURL& origin,
                     UninstallFlag flag,
                     const SyncStatusCallback& callback));
   MOCK_METHOD1(ProcessRemoteChange,
                void(const SyncFileCallback& callback));
   MOCK_METHOD1(SetRemoteChangeProcessor,
                void(RemoteChangeProcessor* processor));
   MOCK_METHOD0(GetLocalChangeProcessor, LocalChangeProcessor*());
-  MOCK_METHOD1(IsConflicting, bool(const fileapi::FileSystemURL& url));
   MOCK_CONST_METHOD0(GetCurrentState,
                      RemoteServiceState());
   MOCK_METHOD1(GetOriginStatusMap,
                void(RemoteFileSyncService::OriginStatusMap* status_map));
   MOCK_METHOD1(SetSyncEnabled, void(bool enabled));
-  MOCK_METHOD1(SetDefaultConflictResolutionPolicy,
-               SyncStatusCode(ConflictResolutionPolicy));
-  MOCK_METHOD2(SetConflictResolutionPolicy,
-               SyncStatusCode(const GURL&, ConflictResolutionPolicy));
-  MOCK_CONST_METHOD0(GetDefaultConflictResolutionPolicy,
-                     ConflictResolutionPolicy());
-  MOCK_CONST_METHOD1(GetConflictResolutionPolicy,
-                     ConflictResolutionPolicy(const GURL&));
-  MOCK_METHOD2(GetRemoteVersions,
-               void(const fileapi::FileSystemURL&,
-                    const RemoteVersionsCallback&));
-  MOCK_METHOD3(DownloadRemoteVersion,
-               void(const fileapi::FileSystemURL&,
-                    const std::string&,
-                    const DownloadVersionCallback&));
   MOCK_METHOD0(PromoteDemotedChanges, void());
 
   virtual void DumpFiles(const GURL& origin,
                          const ListCallback& callback) OVERRIDE;
   virtual void DumpDatabase(const ListCallback& callback) OVERRIDE;
 
   void SetServiceState(RemoteServiceState state);
 
   // Send notifications to the observers.
   // Can be used in the mock implementation.
   void NotifyRemoteChangeQueueUpdated(int64 pending_changes);
   void NotifyRemoteServiceStateUpdated(
       RemoteServiceState state,
       const std::string& description);
   void NotifyFileStatusChanged(
       const fileapi::FileSystemURL& url,
       SyncFileStatus sync_status,
       SyncAction action_taken,
       SyncDirection direction);
 
  private:
   void AddServiceObserverStub(Observer* observer);
   void AddFileStatusObserverStub(FileStatusObserver* observer);
   void RegisterOriginStub(
       const GURL& origin, const SyncStatusCallback& callback);
   void DeleteOriginDirectoryStub(
       const GURL& origin, UninstallFlag flag,
       const SyncStatusCallback& callback);
   void ProcessRemoteChangeStub(const SyncFileCallback& callback);
-  SyncStatusCode SetDefaultConflictResolutionPolicyStub(
-      ConflictResolutionPolicy policy);
-  SyncStatusCode SetConflictResolutionPolicyStub(
-      const GURL& origin,
-      ConflictResolutionPolicy policy);
-  ConflictResolutionPolicy GetDefaultConflictResolutionPolicyStub() const;
-  ConflictResolutionPolicy GetConflictResolutionPolicyStub(
-      const GURL& origin) const;
   RemoteServiceState GetCurrentStateStub() const;
 
   // For default implementation.
   ::testing::NiceMock<MockLocalChangeProcessor> mock_local_change_processor_;
 
   ObserverList<Observer> service_observers_;
   ObserverList<FileStatusObserver> file_status_observers_;
 
   ConflictResolutionPolicy conflict_resolution_policy_;
 
   RemoteServiceState state_;
 
   DISALLOW_COPY_AND_ASSIGN(MockRemoteFileSyncService);
 };
 
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_MOCK_REMOTE_FILE_SYNC_SERVICE_H_