Index: chrome/browser/sync_file_system/sync_task_manager_unittest.cc |
diff --git a/chrome/browser/sync_file_system/sync_task_manager_unittest.cc b/chrome/browser/sync_file_system/sync_task_manager_unittest.cc |
index be9fb0cc9c5c2695d526836bc812ac5d3b78321d..b5ea509a6cd0e88e2d613fd4d76b1a9b2721203d 100644 |
--- a/chrome/browser/sync_file_system/sync_task_manager_unittest.cc |
+++ b/chrome/browser/sync_file_system/sync_task_manager_unittest.cc |
@@ -65,6 +65,7 @@ class TaskManagerClient |
void ScheduleTask(SyncStatusCode status_to_return, |
const SyncStatusCallback& callback) { |
task_manager_->ScheduleTask( |
+ FROM_HERE, |
base::Bind(&TaskManagerClient::DoTask, AsWeakPtr(), |
status_to_return, false /* idle */), |
callback); |
@@ -72,6 +73,7 @@ class TaskManagerClient |
void ScheduleTaskIfIdle(SyncStatusCode status_to_return) { |
task_manager_->ScheduleTaskIfIdle( |
+ FROM_HERE, |
base::Bind(&TaskManagerClient::DoTask, AsWeakPtr(), |
status_to_return, true /* idle */), |
SyncStatusCallback()); |
@@ -245,6 +247,7 @@ TEST(SyncTaskManagerTest, ScheduleAndCancelSyncTask) { |
SyncTaskManager task_manager((base::WeakPtr<SyncTaskManager::Client>())); |
task_manager.Initialize(SYNC_STATUS_OK); |
task_manager.ScheduleSyncTask( |
+ FROM_HERE, |
scoped_ptr<SyncTask>(new MultihopSyncTask( |
&task_started, &task_completed)), |
base::Bind(&IncrementAndAssign, 0, &callback_count, &status)); |
@@ -272,6 +275,7 @@ TEST(SyncTaskManagerTest, ScheduleAndCancelTask) { |
MultihopSyncTask* task = new MultihopSyncTask( |
&task_started, &task_completed); |
task_manager.ScheduleTask( |
+ FROM_HERE, |
base::Bind(&MultihopSyncTask::Run, base::Unretained(task)), |
base::Bind(&IncrementAndAssignWithOwnedPointer<MultihopSyncTask>, |
base::Owned(task), &callback_count, &status)); |
@@ -299,30 +303,35 @@ TEST(SyncTaskManagerTest, ScheduleTaskAtPriority) { |
// This will run first even if its priority is low, since there're no |
// pending tasks. |
task_manager.ScheduleTaskAtPriority( |
+ FROM_HERE, |
base::Bind(&DumbTask, kStatus1), |
SyncTaskManager::PRIORITY_LOW, |
base::Bind(&IncrementAndAssign, 0, &callback_count, &callback_status1)); |
// This runs last (expected counter == 4). |
task_manager.ScheduleTaskAtPriority( |
+ FROM_HERE, |
base::Bind(&DumbTask, kStatus2), |
SyncTaskManager::PRIORITY_LOW, |
base::Bind(&IncrementAndAssign, 4, &callback_count, &callback_status2)); |
// This runs second (expected counter == 1). |
task_manager.ScheduleTaskAtPriority( |
+ FROM_HERE, |
base::Bind(&DumbTask, kStatus3), |
SyncTaskManager::PRIORITY_HIGH, |
base::Bind(&IncrementAndAssign, 1, &callback_count, &callback_status3)); |
// This runs fourth (expected counter == 3). |
task_manager.ScheduleTaskAtPriority( |
+ FROM_HERE, |
base::Bind(&DumbTask, kStatus4), |
SyncTaskManager::PRIORITY_MED, |
base::Bind(&IncrementAndAssign, 3, &callback_count, &callback_status4)); |
// This runs third (expected counter == 2). |
task_manager.ScheduleTaskAtPriority( |
+ FROM_HERE, |
base::Bind(&DumbTask, kStatus5), |
SyncTaskManager::PRIORITY_HIGH, |
base::Bind(&IncrementAndAssign, 2, &callback_count, &callback_status5)); |