[SyncFS] Run V2 backend tasks as SyncTask

chrome/browser/sync_file_system/drive_backend/conflict_resolver.h

Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
index 0e07668794039a2be0ab4607a90fece71f54ca6e..e18a869d76c853cbed18696b52a6e86708a14839 100644
--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
@@ -36,31 +36,32 @@ class TrackerIDSet;
 // of the active tracker.
 // If multiple trackers have the same local path or the same remote file,
 // ConflictResolver picks up one of them and delete others.
-class ConflictResolver : public ExclusiveTask {
+class ConflictResolver : public SyncTask {
  public:
   typedef std::vector<std::string> FileIDList;
 
   explicit ConflictResolver(SyncEngineContext* sync_context);
   virtual ~ConflictResolver();
-  virtual void RunExclusive(const SyncStatusCallback& callback) OVERRIDE;
+  virtual void RunPreflight(scoped_ptr<SyncTaskToken> token) OVERRIDE;
+  void RunExclusive(scoped_ptr<SyncTaskToken> token);
 
  private:
   typedef std::pair<std::string, std::string> FileIDAndETag;
 
-  void DetachFromNonPrimaryParents(const SyncStatusCallback& callback);
-  void DidDetachFromParent(const SyncStatusCallback& callback,
+  void DetachFromNonPrimaryParents(scoped_ptr<SyncTaskToken> token);
+  void DidDetachFromParent(scoped_ptr<SyncTaskToken> token,
                            google_apis::GDataErrorCode error);
 
   std::string PickPrimaryFile(const TrackerIDSet& trackers);
-  void RemoveNonPrimaryFiles(const SyncStatusCallback& callback);
-  void DidRemoveFile(const SyncStatusCallback& callback,
+  void RemoveNonPrimaryFiles(scoped_ptr<SyncTaskToken> token);
+  void DidRemoveFile(scoped_ptr<SyncTaskToken> token,
                      const std::string& file_id,
                      google_apis::GDataErrorCode error);
 
   void UpdateFileMetadata(const std::string& file_id,
-                          const SyncStatusCallback& callback);
+                          scoped_ptr<SyncTaskToken> token);
   void DidGetRemoteMetadata(const std::string& file_id,
-                            const SyncStatusCallback& callback,
+                            scoped_ptr<SyncTaskToken> token,
                             google_apis::GDataErrorCode error,
                             scoped_ptr<google_apis::FileResource> entry);