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

chrome/browser/sync_file_system/sync_file_system_service.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/sync_file_system/sync_file_system_service.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/format_macros.h"
@@ skipping 363 matching lines @@
 
 void SyncFileSystemService::AddSyncEventObserver(SyncEventObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void SyncFileSystemService::RemoveSyncEventObserver(
     SyncEventObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-ConflictResolutionPolicy
-SyncFileSystemService::GetConflictResolutionPolicy() const {
-  return remote_service_->GetConflictResolutionPolicy();
+ConflictResolutionPolicy SyncFileSystemService::GetConflictResolutionPolicy(
+    const GURL& origin) const {
+  return remote_service_->GetConflictResolutionPolicy(origin);
 }
 
 SyncStatusCode SyncFileSystemService::SetConflictResolutionPolicy(
+    const GURL& origin,
     ConflictResolutionPolicy policy) {
-  return remote_service_->SetConflictResolutionPolicy(policy);
+  return remote_service_->SetConflictResolutionPolicy(origin, policy);
 }
 
 LocalChangeProcessor* SyncFileSystemService::GetLocalChangeProcessor(
     const GURL& origin) {
   return GetRemoteService(origin)->GetLocalChangeProcessor();
 }
 
 SyncFileSystemService::SyncFileSystemService(Profile* profile)
     : profile_(profile),
       sync_enabled_(true) {
@@ skipping 361 matching lines @@
                              v2_remote_service_.get()));
     v2_remote_service_->AddServiceObserver(v2_remote_syncer.get());
     v2_remote_service_->AddFileStatusObserver(this);
     v2_remote_service_->SetRemoteChangeProcessor(local_service_.get());
     remote_sync_runners_.push_back(v2_remote_syncer.release());
   }
   return v2_remote_service_.get();
 }
 
 }  // namespace sync_file_system