[SyncFS] Change RemoteFileSyncService interface to accept per-app conflict resolution policy

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 35 matching lines @@
                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(SetConflictResolutionPolicy,
+  MOCK_METHOD1(SetDefaultConflictResolutionPolicy,
                SyncStatusCode(ConflictResolutionPolicy));
-  MOCK_CONST_METHOD0(GetConflictResolutionPolicy,
+  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 scoped_ptr<base::ListValue> DumpFiles(const GURL& origin) OVERRIDE;
@@ skipping 15 matching lines @@
 
  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 GetConflictResolutionPolicyStub() const;
+  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_