Do not inherit TaskPriority in TaskTraits.

base/task_scheduler/sequence_unittest.cc

Index: base/task_scheduler/sequence_unittest.cc
diff --git a/base/task_scheduler/sequence_unittest.cc b/base/task_scheduler/sequence_unittest.cc
index 7093b1e94d78d33cd813671c772879d155f5fda0..39173309e0c52fa60de9d84715ccad3c9515b366 100644
--- a/base/task_scheduler/sequence_unittest.cc
+++ b/base/task_scheduler/sequence_unittest.cc
@@ -10,6 +10,7 @@
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "base/task_scheduler/test_utils.h"
 #include "base/test/gtest_util.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -19,35 +20,34 @@ namespace internal {
 
 namespace {
 
-
 class TaskSchedulerSequenceTest : public testing::Test {
  public:
   TaskSchedulerSequenceTest()
-      : task_a_owned_(
-            new Task(FROM_HERE,
-                     Bind(&DoNothing),
-                     TaskTraits().WithPriority(TaskPriority::BACKGROUND),
-                     TimeDelta())),
-        task_b_owned_(
-            new Task(FROM_HERE,
-                     Bind(&DoNothing),
-                     TaskTraits().WithPriority(TaskPriority::USER_VISIBLE),
-                     TimeDelta())),
-        task_c_owned_(
-            new Task(FROM_HERE,
-                     Bind(&DoNothing),
-                     TaskTraits().WithPriority(TaskPriority::USER_BLOCKING),
-                     TimeDelta())),
-        task_d_owned_(
-            new Task(FROM_HERE,
-                     Bind(&DoNothing),
-                     TaskTraits().WithPriority(TaskPriority::USER_BLOCKING),
-                     TimeDelta())),
-        task_e_owned_(
-            new Task(FROM_HERE,
-                     Bind(&DoNothing),
-                     TaskTraits().WithPriority(TaskPriority::BACKGROUND),
-                     TimeDelta())),
+      : task_a_owned_(new Task(
+            FROM_HERE,
+            Bind(&DoNothing),
+            test::CreateTaskTraits().WithPriority(TaskPriority::BACKGROUND),
+            TimeDelta())),
+        task_b_owned_(new Task(
+            FROM_HERE,
+            Bind(&DoNothing),
+            test::CreateTaskTraits().WithPriority(TaskPriority::USER_VISIBLE),
+            TimeDelta())),
+        task_c_owned_(new Task(
+            FROM_HERE,
+            Bind(&DoNothing),
+            test::CreateTaskTraits().WithPriority(TaskPriority::USER_BLOCKING),
+            TimeDelta())),
+        task_d_owned_(new Task(
+            FROM_HERE,
+            Bind(&DoNothing),
+            test::CreateTaskTraits().WithPriority(TaskPriority::USER_BLOCKING),
+            TimeDelta())),
+        task_e_owned_(new Task(
+            FROM_HERE,
+            Bind(&DoNothing),
+            test::CreateTaskTraits().WithPriority(TaskPriority::BACKGROUND),
+            TimeDelta())),
         task_a_(task_a_owned_.get()),
         task_b_(task_b_owned_.get()),
         task_c_(task_c_owned_.get()),
@@ -200,8 +200,8 @@ TEST_F(TaskSchedulerSequenceTest, GetSortKey) {
 // isn't empty.
 TEST_F(TaskSchedulerSequenceTest, PopNonEmptyFrontSlot) {
   scoped_refptr<Sequence> sequence(new Sequence);
-  sequence->PushTask(
-      MakeUnique<Task>(FROM_HERE, Bind(&DoNothing), TaskTraits(), TimeDelta()));
+  sequence->PushTask(MakeUnique<Task>(FROM_HERE, Bind(&DoNothing),
+                                      test::CreateTaskTraits(), TimeDelta()));
 
   EXPECT_DCHECK_DEATH({ sequence->Pop(); });
 }
@@ -210,8 +210,8 @@ TEST_F(TaskSchedulerSequenceTest, PopNonEmptyFrontSlot) {
 // slot is empty.
 TEST_F(TaskSchedulerSequenceTest, TakeEmptyFrontSlot) {
   scoped_refptr<Sequence> sequence(new Sequence);
-  sequence->PushTask(
-      MakeUnique<Task>(FROM_HERE, Bind(&DoNothing), TaskTraits(), TimeDelta()));
+  sequence->PushTask(MakeUnique<Task>(FROM_HERE, Bind(&DoNothing),
+                                      test::CreateTaskTraits(), TimeDelta()));
 
   EXPECT_TRUE(sequence->TakeTask());
   EXPECT_DCHECK_DEATH({ sequence->TakeTask(); });