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

chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc

Index: chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
index bb685a48737cac37258be202c708e04ccc63e566..e55a2d297a36754f338b5ce3fd373a35e0e6c470 100644
--- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
+++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
@@ -353,7 +353,8 @@ bool SyncFileSystemSetConflictResolutionPolicyFunction::RunImpl() {
   sync_file_system::SyncFileSystemService* service =
       GetSyncFileSystemService(GetProfile());
   DCHECK(service);
-  SyncStatusCode status = service->SetConflictResolutionPolicy(policy);
+  SyncStatusCode status = service->SetConflictResolutionPolicy(
+      source_url().GetOrigin(), policy);
   if (status != sync_file_system::SYNC_STATUS_OK) {
     SetError(ErrorToString(status));
     return false;
@@ -367,7 +368,7 @@ bool SyncFileSystemGetConflictResolutionPolicyFunction::RunImpl() {
   DCHECK(service);
   api::sync_file_system::ConflictResolutionPolicy policy =
       ConflictResolutionPolicyToExtensionEnum(
-          service->GetConflictResolutionPolicy());
+          service->GetConflictResolutionPolicy(source_url().GetOrigin()));
   SetResult(new base::StringValue(
           api::sync_file_system::ToString(policy)));
   return true;