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

chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc

Index: chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc
diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc
index ea36c73c0d527621687e300c40c130ddf1757ac5..8db7895e65e4ed2b45d1cc50f37d9a5cd4460f7d 100644
--- a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc
@@ -268,14 +268,26 @@ void DriveFileSyncService::SetSyncEnabled(bool enabled) {
       OnRemoteServiceStateUpdated(GetCurrentState(), status_message));
 }
 
+SyncStatusCode DriveFileSyncService::SetDefaultConflictResolutionPolicy(
+    ConflictResolutionPolicy policy) {
+  conflict_resolution_resolver_.set_policy(policy);
+  return SYNC_STATUS_OK;
+}
+
 SyncStatusCode DriveFileSyncService::SetConflictResolutionPolicy(
+    const GURL& origin,
     ConflictResolutionPolicy policy) {
   conflict_resolution_resolver_.set_policy(policy);
   return SYNC_STATUS_OK;
 }
 
 ConflictResolutionPolicy
-DriveFileSyncService::GetConflictResolutionPolicy() const {
+DriveFileSyncService::GetDefaultConflictResolutionPolicy() const {
+  return conflict_resolution_resolver_.policy();
+}
+
+ConflictResolutionPolicy
+DriveFileSyncService::GetConflictResolutionPolicy(const GURL& origin) const {
   return conflict_resolution_resolver_.policy();
 }