| Index: base/task_scheduler/delayed_task_manager_unittest.cc
|
| diff --git a/base/task_scheduler/delayed_task_manager_unittest.cc b/base/task_scheduler/delayed_task_manager_unittest.cc
|
| index dca92569c992677ae6c8da0c5511c05f8ea94409..0ab2e0258b68ea81dc1d1a4df2b723987c29b3b5 100644
|
| --- a/base/task_scheduler/delayed_task_manager_unittest.cc
|
| +++ b/base/task_scheduler/delayed_task_manager_unittest.cc
|
| @@ -11,6 +11,7 @@
|
| #include "base/memory/ptr_util.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/task_scheduler/task.h"
|
| +#include "base/task_scheduler/test_utils.h"
|
| #include "base/test/test_mock_time_task_runner.h"
|
| #include "base/time/time.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| @@ -48,8 +49,8 @@ class TaskSchedulerDelayedTaskManagerTest : public testing::Test {
|
|
|
| protected:
|
| std::unique_ptr<Task> CreateTask(TimeDelta delay) {
|
| - auto task =
|
| - MakeUnique<Task>(FROM_HERE, BindOnce(&DoNothing), TaskTraits(), delay);
|
| + auto task = MakeUnique<Task>(FROM_HERE, BindOnce(&DoNothing),
|
| + test::CreateTaskTraits(), delay);
|
|
|
| // The constructor of Task computes |delayed_run_time| by adding |delay| to
|
| // the real time. Recompute it by adding |delay| to the mock time.
|
| @@ -165,16 +166,19 @@ TEST_F(TaskSchedulerDelayedTaskManagerTest, DelayedTaskRunsAfterDelay) {
|
| // they are ripe for execution.
|
| TEST_F(TaskSchedulerDelayedTaskManagerTest, DelayedTasksRunAfterDelay) {
|
| delayed_task_manager_.Start(service_thread_task_runner_);
|
| - auto task_a = MakeUnique<Task>(FROM_HERE, BindOnce(&DoNothing), TaskTraits(),
|
| - TimeDelta::FromHours(1));
|
| + auto task_a =
|
| + MakeUnique<Task>(FROM_HERE, BindOnce(&DoNothing),
|
| + test::CreateTaskTraits(), TimeDelta::FromHours(1));
|
| const Task* task_a_raw = task_a.get();
|
|
|
| - auto task_b = MakeUnique<Task>(FROM_HERE, BindOnce(&DoNothing), TaskTraits(),
|
| - TimeDelta::FromHours(2));
|
| + auto task_b =
|
| + MakeUnique<Task>(FROM_HERE, BindOnce(&DoNothing),
|
| + test::CreateTaskTraits(), TimeDelta::FromHours(2));
|
| const Task* task_b_raw = task_b.get();
|
|
|
| - auto task_c = MakeUnique<Task>(FROM_HERE, BindOnce(&DoNothing), TaskTraits(),
|
| - TimeDelta::FromHours(1));
|
| + auto task_c =
|
| + MakeUnique<Task>(FROM_HERE, BindOnce(&DoNothing),
|
| + test::CreateTaskTraits(), TimeDelta::FromHours(1));
|
| const Task* task_c_raw = task_c.get();
|
|
|
| // Send tasks to the DelayedTaskManager.
|
|
|