X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fsync_file_system%2Fdrive_backend%2Fconflict_resolver.h;h=7bba31c50d47a5eb4cfe81f1b1a9d2658eda27ad;hb=004985e17e624662a4c85c76a7654039dc83f028;hp=2dedc9cb14457379f34bd41d2d5e6d16f2392f27;hpb=2f108dbacb161091e42a3479f4e171339b7e7623;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h b/src/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
index 2dedc9c..7bba31c 100644
--- a/src/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
+++ b/src/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
@@ -36,13 +36,13 @@ 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 SequentialSyncTask {
+class ConflictResolver : public ExclusiveTask {
  public:
   typedef std::vector<std::string> FileIDList;
 
   explicit ConflictResolver(SyncEngineContext* sync_context);
   virtual ~ConflictResolver();
-  virtual void RunSequential(const SyncStatusCallback& callback) OVERRIDE;
+  virtual void RunExclusive(const SyncStatusCallback& callback) OVERRIDE;
 
  private:
   typedef std::pair<std::string, std::string> FileIDAndETag;