Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync_file_system / drive_backend / conflict_resolver.h

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 (file)
--- 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;