Index: base/task_scheduler/scheduler_worker_unittest.cc |
diff --git a/base/task_scheduler/scheduler_worker_unittest.cc b/base/task_scheduler/scheduler_worker_unittest.cc |
index 8d2d1b02b5fcbb0aea5043d22ffc5cf5e940f222..93752a79302a3bbd18d831a62a06c4035ebd6d1c 100644 |
--- a/base/task_scheduler/scheduler_worker_unittest.cc |
+++ b/base/task_scheduler/scheduler_worker_unittest.cc |
@@ -20,6 +20,7 @@ |
#include "base/task_scheduler/sequence.h" |
#include "base/task_scheduler/task.h" |
#include "base/task_scheduler/task_tracker.h" |
+#include "base/task_scheduler/test_utils.h" |
#include "base/test/test_timeouts.h" |
#include "base/threading/platform_thread.h" |
#include "base/threading/simple_thread.h" |
@@ -173,11 +174,11 @@ class TaskSchedulerWorkerTest : public testing::TestWithParam<size_t> { |
// Create a Sequence with TasksPerSequence() Tasks. |
scoped_refptr<Sequence> sequence(new Sequence); |
for (size_t i = 0; i < outer_->TasksPerSequence(); ++i) { |
- std::unique_ptr<Task> task( |
- new Task(FROM_HERE, |
- BindOnce(&TaskSchedulerWorkerTest::RunTaskCallback, |
- Unretained(outer_)), |
- TaskTraits(), TimeDelta())); |
+ auto task = |
+ MakeUnique<Task>(FROM_HERE, |
+ BindOnce(&TaskSchedulerWorkerTest::RunTaskCallback, |
+ Unretained(outer_)), |
+ test::CreateTaskTraits(), TimeDelta()); |
EXPECT_TRUE(outer_->task_tracker_.WillPostTask(task.get())); |
sequence->PushTask(std::move(task)); |
} |
@@ -441,7 +442,7 @@ class ControllableDetachDelegate : public SchedulerWorkerDefaultDelegate { |
controls_->work_requested_ = true; |
scoped_refptr<Sequence> sequence(new Sequence); |
- std::unique_ptr<Task> task(new Task( |
+ auto task = MakeUnique<Task>( |
FROM_HERE, |
BindOnce( |
[](WaitableEvent* work_processed, WaitableEvent* work_running) { |
@@ -450,9 +451,9 @@ class ControllableDetachDelegate : public SchedulerWorkerDefaultDelegate { |
}, |
Unretained(&controls_->work_processed_), |
Unretained(&controls_->work_running_)), |
- TaskTraits().WithBaseSyncPrimitives().WithShutdownBehavior( |
+ test::CreateTaskTraits().WithBaseSyncPrimitives().WithShutdownBehavior( |
TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN), |
- TimeDelta())); |
+ TimeDelta()); |
EXPECT_TRUE(task_tracker_->WillPostTask(task.get())); |
sequence->PushTask(std::move(task)); |
return sequence; |