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

chrome/browser/sync_file_system/drive_backend/sync_engine.cc

 // Copyright 2013 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/drive_backend/sync_engine.h"
 
 #include "base/bind.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 #include "chrome/browser/drive/drive_api_service.h"
@@ skipping 257 matching lines @@
   sync_enabled_ = enabled;
   if (old_state == GetCurrentState())
     return;
 
   const char* status_message = enabled ? "Sync is enabled" : "Sync is disabled";
   FOR_EACH_OBSERVER(
       Observer, service_observers_,
       OnRemoteServiceStateUpdated(GetCurrentState(), status_message));
 }
 
-SyncStatusCode SyncEngine::SetConflictResolutionPolicy(
+SyncStatusCode SyncEngine::SetDefaultConflictResolutionPolicy(
     ConflictResolutionPolicy policy) {
-  conflict_resolution_policy_ = policy;
+  default_conflict_resolution_policy_ = policy;
   return SYNC_STATUS_OK;
 }
 
-ConflictResolutionPolicy SyncEngine::GetConflictResolutionPolicy() const {
-  return conflict_resolution_policy_;
+SyncStatusCode SyncEngine::SetConflictResolutionPolicy(
+    const GURL& origin,
+    ConflictResolutionPolicy policy) {
+  NOTIMPLEMENTED();
+  default_conflict_resolution_policy_ = policy;
+  return SYNC_STATUS_OK;
+}
+
+ConflictResolutionPolicy SyncEngine::GetDefaultConflictResolutionPolicy()
+    const {
+  return default_conflict_resolution_policy_;
+}
+
+ConflictResolutionPolicy SyncEngine::GetConflictResolutionPolicy(
+    const GURL& origin) const {
+  NOTIMPLEMENTED();
+  return default_conflict_resolution_policy_;
 }
 
 void SyncEngine::GetRemoteVersions(
     const fileapi::FileSystemURL& url,
     const RemoteVersionsCallback& callback) {
   // TODO(tzik): Implement this before we support manual conflict resolution.
   callback.Run(SYNC_STATUS_FAILED, std::vector<Version>());
 }
 
 void SyncEngine::DownloadRemoteVersion(
@@ skipping 138 matching lines @@
       drive_uploader_(drive_uploader.Pass()),
       notification_manager_(notification_manager),
       extension_service_(extension_service),
       auth_token_service_(auth_token_service),
       remote_change_processor_(NULL),
       service_state_(REMOTE_SERVICE_TEMPORARY_UNAVAILABLE),
       should_check_conflict_(true),
       should_check_remote_change_(true),
       listing_remote_changes_(false),
       sync_enabled_(false),
-      conflict_resolution_policy_(CONFLICT_RESOLUTION_POLICY_LAST_WRITE_WIN),
+      default_conflict_resolution_policy_(
+          CONFLICT_RESOLUTION_POLICY_LAST_WRITE_WIN),
       network_available_(false),
       weak_ptr_factory_(this) {
 }
 
 void SyncEngine::DoDisableApp(const std::string& app_id,
                               const SyncStatusCallback& callback) {
   if (metadata_database_)
     metadata_database_->DisableApp(app_id, callback);
   else
     callback.Run(SYNC_STATUS_OK);
@@ skipping 270 matching lines @@
         tracker.tracker_kind() == TRACKER_KIND_APP_ROOT;
     if (is_app_enabled && !is_app_root_tracker_enabled)
       EnableOrigin(origin, base::Bind(&EmptyStatusCallback));
     else if (!is_app_enabled && is_app_root_tracker_enabled)
       DisableOrigin(origin, base::Bind(&EmptyStatusCallback));
   }
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system