Index: third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc |
diff --git a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc |
index faab2f96607bef2f32df940fac949fcc3616ac97..cad4d89b10b63009046f3b5d0044444f20774a3f 100644 |
--- a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc |
+++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc |
@@ -2271,20 +2271,24 @@ TEST_F(TaskQueueManagerTest, NoWakeUpsForCanceledDelayedTasks) { |
base::TimeDelta delay4(base::TimeDelta::FromSeconds(30)); |
std::vector<base::TimeTicks> run_times; |
runners_[0]->PostDelayedTask( |
- FROM_HERE, base::Bind(&CancelableTask::RecordTimeTask, |
- task1.weak_factory_.GetWeakPtr(), &run_times), |
+ FROM_HERE, |
+ base::Bind(&CancelableTask::RecordTimeTask, |
+ task1.weak_factory_.GetWeakPtr(), &run_times), |
delay1); |
runners_[0]->PostDelayedTask( |
- FROM_HERE, base::Bind(&CancelableTask::RecordTimeTask, |
- task2.weak_factory_.GetWeakPtr(), &run_times), |
+ FROM_HERE, |
+ base::Bind(&CancelableTask::RecordTimeTask, |
+ task2.weak_factory_.GetWeakPtr(), &run_times), |
delay2); |
runners_[0]->PostDelayedTask( |
- FROM_HERE, base::Bind(&CancelableTask::RecordTimeTask, |
- task3.weak_factory_.GetWeakPtr(), &run_times), |
+ FROM_HERE, |
+ base::Bind(&CancelableTask::RecordTimeTask, |
+ task3.weak_factory_.GetWeakPtr(), &run_times), |
delay3); |
runners_[0]->PostDelayedTask( |
- FROM_HERE, base::Bind(&CancelableTask::RecordTimeTask, |
- task4.weak_factory_.GetWeakPtr(), &run_times), |
+ FROM_HERE, |
+ base::Bind(&CancelableTask::RecordTimeTask, |
+ task4.weak_factory_.GetWeakPtr(), &run_times), |
delay4); |
task2.weak_factory_.InvalidateWeakPtrs(); |
@@ -2319,20 +2323,24 @@ TEST_F(TaskQueueManagerTest, NoWakeUpsForCanceledDelayedTasksReversePostOrder) { |
base::TimeDelta delay4(base::TimeDelta::FromSeconds(30)); |
std::vector<base::TimeTicks> run_times; |
runners_[0]->PostDelayedTask( |
- FROM_HERE, base::Bind(&CancelableTask::RecordTimeTask, |
- task4.weak_factory_.GetWeakPtr(), &run_times), |
+ FROM_HERE, |
+ base::Bind(&CancelableTask::RecordTimeTask, |
+ task4.weak_factory_.GetWeakPtr(), &run_times), |
delay4); |
runners_[0]->PostDelayedTask( |
- FROM_HERE, base::Bind(&CancelableTask::RecordTimeTask, |
- task3.weak_factory_.GetWeakPtr(), &run_times), |
+ FROM_HERE, |
+ base::Bind(&CancelableTask::RecordTimeTask, |
+ task3.weak_factory_.GetWeakPtr(), &run_times), |
delay3); |
runners_[0]->PostDelayedTask( |
- FROM_HERE, base::Bind(&CancelableTask::RecordTimeTask, |
- task2.weak_factory_.GetWeakPtr(), &run_times), |
+ FROM_HERE, |
+ base::Bind(&CancelableTask::RecordTimeTask, |
+ task2.weak_factory_.GetWeakPtr(), &run_times), |
delay2); |
runners_[0]->PostDelayedTask( |
- FROM_HERE, base::Bind(&CancelableTask::RecordTimeTask, |
- task1.weak_factory_.GetWeakPtr(), &run_times), |
+ FROM_HERE, |
+ base::Bind(&CancelableTask::RecordTimeTask, |
+ task1.weak_factory_.GetWeakPtr(), &run_times), |
delay1); |
task2.weak_factory_.InvalidateWeakPtrs(); |
@@ -2367,20 +2375,24 @@ TEST_F(TaskQueueManagerTest, TimeDomainWakeUpOnlyCancelledIfAllUsesCancelled) { |
base::TimeDelta delay4(base::TimeDelta::FromSeconds(30)); |
std::vector<base::TimeTicks> run_times; |
runners_[0]->PostDelayedTask( |
- FROM_HERE, base::Bind(&CancelableTask::RecordTimeTask, |
- task1.weak_factory_.GetWeakPtr(), &run_times), |
+ FROM_HERE, |
+ base::Bind(&CancelableTask::RecordTimeTask, |
+ task1.weak_factory_.GetWeakPtr(), &run_times), |
delay1); |
runners_[0]->PostDelayedTask( |
- FROM_HERE, base::Bind(&CancelableTask::RecordTimeTask, |
- task2.weak_factory_.GetWeakPtr(), &run_times), |
+ FROM_HERE, |
+ base::Bind(&CancelableTask::RecordTimeTask, |
+ task2.weak_factory_.GetWeakPtr(), &run_times), |
delay2); |
runners_[0]->PostDelayedTask( |
- FROM_HERE, base::Bind(&CancelableTask::RecordTimeTask, |
- task3.weak_factory_.GetWeakPtr(), &run_times), |
+ FROM_HERE, |
+ base::Bind(&CancelableTask::RecordTimeTask, |
+ task3.weak_factory_.GetWeakPtr(), &run_times), |
delay3); |
runners_[0]->PostDelayedTask( |
- FROM_HERE, base::Bind(&CancelableTask::RecordTimeTask, |
- task4.weak_factory_.GetWeakPtr(), &run_times), |
+ FROM_HERE, |
+ base::Bind(&CancelableTask::RecordTimeTask, |
+ task4.weak_factory_.GetWeakPtr(), &run_times), |
delay4); |
// Post a non-canceled task with |delay3|. So we should still get a wake-up at |
@@ -2501,20 +2513,24 @@ TEST_F(TaskQueueManagerTest, SweepCanceledDelayedTasks) { |
base::TimeDelta delay4(base::TimeDelta::FromSeconds(30)); |
std::vector<base::TimeTicks> run_times; |
runners_[0]->PostDelayedTask( |
- FROM_HERE, base::Bind(&CancelableTask::RecordTimeTask, |
- task1.weak_factory_.GetWeakPtr(), &run_times), |
+ FROM_HERE, |
+ base::Bind(&CancelableTask::RecordTimeTask, |
+ task1.weak_factory_.GetWeakPtr(), &run_times), |
delay1); |
runners_[0]->PostDelayedTask( |
- FROM_HERE, base::Bind(&CancelableTask::RecordTimeTask, |
- task2.weak_factory_.GetWeakPtr(), &run_times), |
+ FROM_HERE, |
+ base::Bind(&CancelableTask::RecordTimeTask, |
+ task2.weak_factory_.GetWeakPtr(), &run_times), |
delay2); |
runners_[0]->PostDelayedTask( |
- FROM_HERE, base::Bind(&CancelableTask::RecordTimeTask, |
- task3.weak_factory_.GetWeakPtr(), &run_times), |
+ FROM_HERE, |
+ base::Bind(&CancelableTask::RecordTimeTask, |
+ task3.weak_factory_.GetWeakPtr(), &run_times), |
delay3); |
runners_[0]->PostDelayedTask( |
- FROM_HERE, base::Bind(&CancelableTask::RecordTimeTask, |
- task4.weak_factory_.GetWeakPtr(), &run_times), |
+ FROM_HERE, |
+ base::Bind(&CancelableTask::RecordTimeTask, |
+ task4.weak_factory_.GetWeakPtr(), &run_times), |
delay4); |
EXPECT_EQ(4u, runners_[0]->GetNumberOfPendingTasks()); |