Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync_file_system / drive_backend / list_changes_task.cc

diff --git a/src/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc b/src/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc
index c6273d2..4deb768 100644 (file)
--- a/src/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc
+++ b/src/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/sync_file_system/drive_backend/list_changes_task.h"
 
+#include <vector>
+
 #include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/location.h"
@@ -40,9 +42,9 @@ void ListChangesTask::RunPreflight(scoped_ptr<SyncTaskToken> token) {
     return;
   }
 
-  SyncTaskManager::UpdateBlockingFactor(
+  SyncTaskManager::UpdateTaskBlocker(
       token.Pass(),
-      scoped_ptr<BlockingFactor>(new BlockingFactor),
+      scoped_ptr<TaskBlocker>(new TaskBlocker),
       base::Bind(&ListChangesTask::StartListing,
                  weak_ptr_factory_.GetWeakPtr()));
 }
@@ -97,11 +99,11 @@ void ListChangesTask::DidListChanges(
     return;
   }
 
-  scoped_ptr<BlockingFactor> blocking_factor(new BlockingFactor);
-  blocking_factor->exclusive = true;
-  SyncTaskManager::UpdateBlockingFactor(
+  scoped_ptr<TaskBlocker> task_blocker(new TaskBlocker);
+  task_blocker->exclusive = true;
+  SyncTaskManager::UpdateTaskBlocker(
       token.Pass(),
-      blocking_factor.Pass(),
+      task_blocker.Pass(),
       base::Bind(&ListChangesTask::CheckInChangeList,
                  weak_ptr_factory_.GetWeakPtr(),
                  change_list->largest_change_id()));
@@ -118,23 +120,16 @@ void ListChangesTask::CheckInChangeList(int64 largest_change_id,
   for (size_t i = 0; i < change_list_.size(); ++i)
     file_ids_.push_back(change_list_[i]->file_id());
 
-  metadata_database()->UpdateByChangeList(
-      largest_change_id,
-      change_list_.Pass(),
-      base::Bind(&ListChangesTask::DidCheckInChangeList,
-                 weak_ptr_factory_.GetWeakPtr(), base::Passed(&token)));
-}
-
-void ListChangesTask::DidCheckInChangeList(scoped_ptr<SyncTaskToken> token,
-                                           SyncStatusCode status) {
+  SyncStatusCode status =
+      metadata_database()->UpdateByChangeList(
+          largest_change_id, change_list_.Pass());
   if (status != SYNC_STATUS_OK) {
     SyncTaskManager::NotifyTaskDone(token.Pass(), status);
     return;
   }
 
-  metadata_database()->SweepDirtyTrackers(
-      file_ids_,
-      base::Bind(&SyncTaskManager::NotifyTaskDone, base::Passed(&token)));
+  status = metadata_database()->SweepDirtyTrackers(file_ids_);
+  SyncTaskManager::NotifyTaskDone(token.Pass(), status);
 }
 
 bool ListChangesTask::IsContextReady() {