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

chrome/browser/sync_file_system/drive_backend/sync_engine.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
@@ skipping 67 matching lines @@
   virtual void ProcessRemoteChange(const SyncFileCallback& callback) OVERRIDE;
   virtual void SetRemoteChangeProcessor(
       RemoteChangeProcessor* processor) OVERRIDE;
   virtual LocalChangeProcessor* GetLocalChangeProcessor() OVERRIDE;
   virtual bool IsConflicting(const fileapi::FileSystemURL& url) OVERRIDE;
   virtual RemoteServiceState GetCurrentState() const OVERRIDE;
   virtual void GetOriginStatusMap(OriginStatusMap* status_map) OVERRIDE;
   virtual scoped_ptr<base::ListValue> DumpFiles(const GURL& origin) OVERRIDE;
   virtual scoped_ptr<base::ListValue> DumpDatabase() OVERRIDE;
   virtual void SetSyncEnabled(bool enabled) OVERRIDE;
+  virtual SyncStatusCode SetDefaultConflictResolutionPolicy(
+      ConflictResolutionPolicy policy) OVERRIDE;
   virtual SyncStatusCode SetConflictResolutionPolicy(
+      const GURL& origin,
       ConflictResolutionPolicy policy) OVERRIDE;
-  virtual ConflictResolutionPolicy GetConflictResolutionPolicy() const OVERRIDE;
+  virtual ConflictResolutionPolicy GetDefaultConflictResolutionPolicy()
+      const OVERRIDE;
+  virtual ConflictResolutionPolicy GetConflictResolutionPolicy(
+      const GURL& origin) const OVERRIDE;
   virtual void GetRemoteVersions(
       const fileapi::FileSystemURL& url,
       const RemoteVersionsCallback& callback) OVERRIDE;
   virtual void DownloadRemoteVersion(
       const fileapi::FileSystemURL& url,
       const std::string& version_id,
       const DownloadVersionCallback& callback) OVERRIDE;
   virtual void PromoteDemotedChanges() OVERRIDE;
 
   // LocalChangeProcessor overrides.
@@ skipping 89 matching lines @@
   RemoteChangeProcessor* remote_change_processor_;
 
   RemoteServiceState service_state_;
 
   bool should_check_conflict_;
   bool should_check_remote_change_;
   bool listing_remote_changes_;
   base::TimeTicks time_to_check_changes_;
 
   bool sync_enabled_;
-  ConflictResolutionPolicy conflict_resolution_policy_;
+  ConflictResolutionPolicy default_conflict_resolution_policy_;
   bool network_available_;
 
   scoped_ptr<SyncTaskManager> task_manager_;
 
   base::WeakPtrFactory<SyncEngine> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncEngine);
 };
 
 }  // namespace drive_backend
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_H_