Re-write many calls to WrapUnique() with MakeUnique()

base/task_scheduler/task_tracker_unittest.cc

Index: base/task_scheduler/task_tracker_unittest.cc
diff --git a/base/task_scheduler/task_tracker_unittest.cc b/base/task_scheduler/task_tracker_unittest.cc
index fedb215669889f409018bfa0b2577cc4051ffb3e..4c187f186b98913b94013df0806d5013bb748449 100644
--- a/base/task_scheduler/task_tracker_unittest.cc
+++ b/base/task_scheduler/task_tracker_unittest.cc
@@ -127,10 +127,10 @@ class TaskSchedulerTaskTrackerTest
 
   // Creates a task with |shutdown_behavior|.
   std::unique_ptr<Task> CreateTask(TaskShutdownBehavior shutdown_behavior) {
-    return WrapUnique(new Task(
+    return MakeUnique<Task>(
         FROM_HERE,
         Bind(&TaskSchedulerTaskTrackerTest::RunTaskCallback, Unretained(this)),
-        TaskTraits().WithShutdownBehavior(shutdown_behavior), TimeDelta()));
+        TaskTraits().WithShutdownBehavior(shutdown_behavior), TimeDelta());
   }
 
   // Calls tracker_->Shutdown() on a new thread. When this returns, Shutdown()
@@ -512,22 +512,22 @@ TEST_F(TaskSchedulerTaskTrackerTest, LoadWillPostAndRunBeforeShutdown) {
   std::vector<std::unique_ptr<ThreadPostingAndRunningTask>> threads;
 
   for (size_t i = 0; i < kLoadTestNumIterations; ++i) {
-    threads.push_back(WrapUnique(new ThreadPostingAndRunningTask(
+    threads.push_back(MakeUnique<ThreadPostingAndRunningTask>(
         &tracker_, CreateSequenceWithTask(
                        CreateTask(TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN)),
-        ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, true)));
+        ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, true));
     threads.back()->Start();
 
-    threads.push_back(WrapUnique(new ThreadPostingAndRunningTask(
+    threads.push_back(MakeUnique<ThreadPostingAndRunningTask>(
         &tracker_, CreateSequenceWithTask(
                        CreateTask(TaskShutdownBehavior::SKIP_ON_SHUTDOWN)),
-        ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, true)));
+        ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, true));
     threads.back()->Start();
 
-    threads.push_back(WrapUnique(new ThreadPostingAndRunningTask(
+    threads.push_back(MakeUnique<ThreadPostingAndRunningTask>(
         &tracker_, CreateSequenceWithTask(
                        CreateTask(TaskShutdownBehavior::BLOCK_SHUTDOWN)),
-        ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, true)));
+        ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, true));
     threads.back()->Start();
   }
 
@@ -550,23 +550,23 @@ TEST_F(TaskSchedulerTaskTrackerTest,
   for (size_t i = 0; i < kLoadTestNumIterations; ++i) {
     sequences.push_back(CreateSequenceWithTask(
         CreateTask(TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN)));
-    post_threads.push_back(WrapUnique(new ThreadPostingAndRunningTask(
+    post_threads.push_back(MakeUnique<ThreadPostingAndRunningTask>(
         &tracker_, sequences.back(),
-        ThreadPostingAndRunningTask::Action::WILL_POST, true)));
+        ThreadPostingAndRunningTask::Action::WILL_POST, true));
     post_threads.back()->Start();
 
     sequences.push_back(CreateSequenceWithTask(
         CreateTask(TaskShutdownBehavior::SKIP_ON_SHUTDOWN)));
-    post_threads.push_back(WrapUnique(new ThreadPostingAndRunningTask(
+    post_threads.push_back(MakeUnique<ThreadPostingAndRunningTask>(
         &tracker_, sequences.back(),
-        ThreadPostingAndRunningTask::Action::WILL_POST, true)));
+        ThreadPostingAndRunningTask::Action::WILL_POST, true));
     post_threads.back()->Start();
 
     sequences.push_back(CreateSequenceWithTask(
         CreateTask(TaskShutdownBehavior::BLOCK_SHUTDOWN)));
-    post_threads.push_back(WrapUnique(new ThreadPostingAndRunningTask(
+    post_threads.push_back(MakeUnique<ThreadPostingAndRunningTask>(
         &tracker_, sequences.back(),
-        ThreadPostingAndRunningTask::Action::WILL_POST, true)));
+        ThreadPostingAndRunningTask::Action::WILL_POST, true));
     post_threads.back()->Start();
   }
 
@@ -580,8 +580,8 @@ TEST_F(TaskSchedulerTaskTrackerTest,
   std::vector<std::unique_ptr<ThreadPostingAndRunningTask>> run_threads;
 
   for (const auto& sequence : sequences) {
-    run_threads.push_back(WrapUnique(new ThreadPostingAndRunningTask(
-        &tracker_, sequence, ThreadPostingAndRunningTask::Action::RUN, false)));
+    run_threads.push_back(MakeUnique<ThreadPostingAndRunningTask>(
+        &tracker_, sequence, ThreadPostingAndRunningTask::Action::RUN, false));
     run_threads.back()->Start();
   }
 
@@ -608,22 +608,22 @@ TEST_F(TaskSchedulerTaskTrackerTest, LoadWillPostAndRunDuringShutdown) {
   std::vector<std::unique_ptr<ThreadPostingAndRunningTask>> threads;
 
   for (size_t i = 0; i < kLoadTestNumIterations; ++i) {
-    threads.push_back(WrapUnique(new ThreadPostingAndRunningTask(
+    threads.push_back(MakeUnique<ThreadPostingAndRunningTask>(
         &tracker_, CreateSequenceWithTask(
                        CreateTask(TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN)),
-        ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, false)));
+        ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, false));
     threads.back()->Start();
 
-    threads.push_back(WrapUnique(new ThreadPostingAndRunningTask(
+    threads.push_back(MakeUnique<ThreadPostingAndRunningTask>(
         &tracker_, CreateSequenceWithTask(
                        CreateTask(TaskShutdownBehavior::SKIP_ON_SHUTDOWN)),
-        ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, false)));
+        ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, false));
     threads.back()->Start();
 
-    threads.push_back(WrapUnique(new ThreadPostingAndRunningTask(
+    threads.push_back(MakeUnique<ThreadPostingAndRunningTask>(
         &tracker_, CreateSequenceWithTask(
                        CreateTask(TaskShutdownBehavior::BLOCK_SHUTDOWN)),
-        ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, true)));
+        ThreadPostingAndRunningTask::Action::WILL_POST_AND_RUN, true));
     threads.back()->Start();
   }