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

chrome/browser/sync_file_system/sync_file_system_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_SYNC_FILE_SYSTEM_SERVICE_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_H_
 
 #include <map>
 #include <string>
 
@@ skipping 53 matching lines @@
   scoped_ptr<base::ListValue> DumpDatabase();
 
   // Returns the file |url|'s sync status.
   void GetFileSyncStatus(
       const fileapi::FileSystemURL& url,
       const SyncFileStatusCallback& callback);
 
   void AddSyncEventObserver(SyncEventObserver* observer);
   void RemoveSyncEventObserver(SyncEventObserver* observer);
 
-  ConflictResolutionPolicy GetConflictResolutionPolicy() const;
-  SyncStatusCode SetConflictResolutionPolicy(ConflictResolutionPolicy policy);
+  ConflictResolutionPolicy GetConflictResolutionPolicy(
+      const GURL& origin) const;
+  SyncStatusCode SetConflictResolutionPolicy(const GURL& origin,
+                                             ConflictResolutionPolicy policy);
 
   LocalChangeProcessor* GetLocalChangeProcessor(const GURL& origin);
 
   void OnSyncIdle();
 
  private:
   friend class SyncFileSystemServiceFactory;
   friend class SyncFileSystemServiceTest;
   friend struct base::DefaultDeleter<SyncFileSystemService>;
   friend class LocalSyncRunner;
@@ skipping 82 matching lines @@
   bool sync_enabled_;
 
   ObserverList<SyncEventObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncFileSystemService);
 };
 
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_H_