Use constexpr TaskTraits constructor in base (part 2).

base/test/scoped_task_scheduler_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/test/scoped_task_scheduler.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
@@ skipping 239 matching lines @@
 
   RunLoop().RunUntilIdle();
 
   EXPECT_TRUE(com_task_ran);
 }
 #endif  // defined(OS_WIN)
 
 TEST(ScopedTaskSchedulerTest, NonBlockShutdownTasksPostedAfterShutdownDontRun) {
   ScopedTaskScheduler scoped_task_scheduler;
   TaskScheduler::GetInstance()->Shutdown();
-  PostTaskWithTraits(FROM_HERE,
-                     TaskTraits().WithShutdownBehavior(
-                         TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN),
+  PostTaskWithTraits(FROM_HERE, {TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
                      BindOnce([]() {
                        ADD_FAILURE()
                            << "CONTINUE_ON_SHUTDOWN task should not run";
                      }));
-  PostTaskWithTraits(
-      FROM_HERE,
-      TaskTraits().WithShutdownBehavior(TaskShutdownBehavior::SKIP_ON_SHUTDOWN),
-      BindOnce(
-          []() { ADD_FAILURE() << "SKIP_ON_SHUTDOWN task should not run"; }));
+  PostTaskWithTraits(FROM_HERE, {TaskShutdownBehavior::SKIP_ON_SHUTDOWN},
+                     BindOnce([]() {
+                       ADD_FAILURE() << "SKIP_ON_SHUTDOWN task should not run";
+                     }));
 
   // This should not run anything.
   RunLoop().RunUntilIdle();
 }
 
 TEST(ScopedTaskSchedulerTest, DestructorRunsBlockShutdownTasksOnly) {
   bool block_shutdown_task_ran = false;
   {
     ScopedTaskScheduler scoped_task_scheduler;
-    PostTaskWithTraits(FROM_HERE,
-                       TaskTraits().WithShutdownBehavior(
-                           TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN),
+    PostTaskWithTraits(FROM_HERE, {TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
                        BindOnce([]() {
                          ADD_FAILURE()
                              << "CONTINUE_ON_SHUTDOWN task should not run";
                        }));
-    PostTaskWithTraits(FROM_HERE,
-                       TaskTraits().WithShutdownBehavior(
-                           TaskShutdownBehavior::SKIP_ON_SHUTDOWN),
+    PostTaskWithTraits(FROM_HERE, {TaskShutdownBehavior::SKIP_ON_SHUTDOWN},
                        BindOnce([]() {
                          ADD_FAILURE()
                              << "SKIP_ON_SHUTDOWN task should not run";
                        }));
-    PostTaskWithTraits(
-        FROM_HERE,
-        TaskTraits().WithShutdownBehavior(TaskShutdownBehavior::BLOCK_SHUTDOWN),
-        BindOnce(
-            [](bool* block_shutdown_task_ran) {
-              *block_shutdown_task_ran = true;
-            },
-            Unretained(&block_shutdown_task_ran)));
+    PostTaskWithTraits(FROM_HERE, {TaskShutdownBehavior::BLOCK_SHUTDOWN},
+                       BindOnce(
+                           [](bool* block_shutdown_task_ran) {
+                             *block_shutdown_task_ran = true;
+                           },
+                           Unretained(&block_shutdown_task_ran)));
   }
   EXPECT_TRUE(block_shutdown_task_ran);
 }
 
 TEST(ScopedTaskSchedulerTest, ReassignCurrentTaskRunner) {
   bool first_task_ran = false;
   bool second_task_ran = false;
 
   auto TestTaskRan = [](bool* task_ran) { *task_ran = true; };
 
@@ skipping 32 matching lines @@
                           BindOnce([](bool* task_ran) { *task_ran = true; },
                                    Unretained(task_ran)));
                },
                Unretained(&task_ran)));
   RunLoop().RunUntilIdle();
   EXPECT_TRUE(task_ran);
 }
 
 }  // namespace test
 }  // namespace base