diff options
Diffstat (limited to 'chromium/base/task_scheduler/task_tracker_posix_unittest.cc')
-rw-r--r-- | chromium/base/task_scheduler/task_tracker_posix_unittest.cc | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/chromium/base/task_scheduler/task_tracker_posix_unittest.cc b/chromium/base/task_scheduler/task_tracker_posix_unittest.cc index 9ca9a913d97..6eb1642504f 100644 --- a/chromium/base/task_scheduler/task_tracker_posix_unittest.cc +++ b/chromium/base/task_scheduler/task_tracker_posix_unittest.cc @@ -42,7 +42,7 @@ class TaskSchedulerTaskTrackerPosixTest : public testing::Test { protected: Thread service_thread_; - TaskTrackerPosix tracker_; + TaskTrackerPosix tracker_ = {"Test"}; private: DISALLOW_COPY_AND_ASSIGN(TaskSchedulerTaskTrackerPosixTest); @@ -53,12 +53,11 @@ class TaskSchedulerTaskTrackerPosixTest : public testing::Test { // Verify that TaskTrackerPosix runs a Task it receives. TEST_F(TaskSchedulerTaskTrackerPosixTest, RunTask) { bool did_run = false; - auto task = std::make_unique<Task>( - FROM_HERE, - Bind([](bool* did_run) { *did_run = true; }, Unretained(&did_run)), - TaskTraits(), TimeDelta()); + Task task(FROM_HERE, + Bind([](bool* did_run) { *did_run = true; }, Unretained(&did_run)), + TaskTraits(), TimeDelta()); - EXPECT_TRUE(tracker_.WillPostTask(task.get())); + EXPECT_TRUE(tracker_.WillPostTask(task)); auto sequence = test::CreateSequenceWithTask(std::move(task)); EXPECT_EQ(sequence, tracker_.WillScheduleSequence(sequence, nullptr)); @@ -74,15 +73,14 @@ TEST_F(TaskSchedulerTaskTrackerPosixTest, RunTask) { TEST_F(TaskSchedulerTaskTrackerPosixTest, FileDescriptorWatcher) { int fds[2]; ASSERT_EQ(0, pipe(fds)); - auto task = std::make_unique<Task>( - FROM_HERE, - Bind(IgnoreResult(&FileDescriptorWatcher::WatchReadable), fds[0], - Bind(&DoNothing)), - TaskTraits(), TimeDelta()); + Task task(FROM_HERE, + Bind(IgnoreResult(&FileDescriptorWatcher::WatchReadable), fds[0], + Bind(&DoNothing)), + TaskTraits(), TimeDelta()); // FileDescriptorWatcher::WatchReadable needs a SequencedTaskRunnerHandle. - task->sequenced_task_runner_ref = MakeRefCounted<NullTaskRunner>(); + task.sequenced_task_runner_ref = MakeRefCounted<NullTaskRunner>(); - EXPECT_TRUE(tracker_.WillPostTask(task.get())); + EXPECT_TRUE(tracker_.WillPostTask(task)); auto sequence = test::CreateSequenceWithTask(std::move(task)); EXPECT_EQ(sequence, tracker_.WillScheduleSequence(sequence, nullptr)); |