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

chrome/browser/extensions/api/sync_file_system/sync_file_system_api.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/extensions/api/sync_file_system/sync_file_system_api.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 335 matching lines @@
   ConflictResolutionPolicy policy = ExtensionEnumToConflictResolutionPolicy(
       api::sync_file_system::ParseConflictResolutionPolicy(policy_string));
   if (policy == sync_file_system::CONFLICT_RESOLUTION_POLICY_UNKNOWN) {
     SetError(base::StringPrintf(kUnsupportedConflictResolutionPolicy,
                                 policy_string.c_str()));
     return false;
   }
   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;
   }
   return true;
 }
 
 bool SyncFileSystemGetConflictResolutionPolicyFunction::RunImpl() {
   sync_file_system::SyncFileSystemService* service =
       GetSyncFileSystemService(GetProfile());
   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;
 }
 
 bool SyncFileSystemGetServiceStatusFunction::RunImpl() {
   sync_file_system::SyncFileSystemService* service =
       GetSyncFileSystemService(GetProfile());
   results_ = api::sync_file_system::GetServiceStatus::Results::Create(
       SyncServiceStateToExtensionEnum(service->GetSyncServiceState()));
   return true;
 }
 
 }  // namespace extensions