Do not inherit TaskPriority in TaskTraits.

base/task_scheduler/task_scheduler_impl_unittest.cc

Index: base/task_scheduler/task_scheduler_impl_unittest.cc
diff --git a/base/task_scheduler/task_scheduler_impl_unittest.cc b/base/task_scheduler/task_scheduler_impl_unittest.cc
index 04ddc6fdfd4da5b75d7fb8f72744d339872728af..15ce314badae3941ec11eb259e46092abde5caf5 100644
--- a/base/task_scheduler/task_scheduler_impl_unittest.cc
+++ b/base/task_scheduler/task_scheduler_impl_unittest.cc
@@ -20,6 +20,7 @@
 #include "base/task_scheduler/scheduler_worker_pool_params.h"
 #include "base/task_scheduler/task_traits.h"
 #include "base/task_scheduler/test_task_factory.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"
@@ -166,9 +167,10 @@ std::vector<TraitsExecutionModePair> GetTraitsExecutionModePairs() {
          ++priority_index) {
       const TaskPriority priority = static_cast<TaskPriority>(priority_index);
       params.push_back(TraitsExecutionModePair(
-          TaskTraits().WithPriority(priority), execution_mode));
+          test::CreateTaskTraits().WithPriority(priority), execution_mode));
       params.push_back(TraitsExecutionModePair(
-          TaskTraits().WithPriority(priority).MayBlock(), execution_mode));
+          test::CreateTaskTraits().WithPriority(priority).MayBlock(),
+          execution_mode));
     }
   }
 
@@ -285,32 +287,39 @@ TEST_F(TaskSchedulerImplTest, MultipleTraitsExecutionModePairs) {
 }
 
 TEST_F(TaskSchedulerImplTest, GetMaxConcurrentTasksWithTraitsDeprecated) {
-  EXPECT_EQ(1, scheduler_->GetMaxConcurrentTasksWithTraitsDeprecated(
-                   TaskTraits().WithPriority(TaskPriority::BACKGROUND)));
   EXPECT_EQ(
-      3, scheduler_->GetMaxConcurrentTasksWithTraitsDeprecated(
-             TaskTraits().WithPriority(TaskPriority::BACKGROUND).MayBlock()));
-  EXPECT_EQ(4, scheduler_->GetMaxConcurrentTasksWithTraitsDeprecated(
-                   TaskTraits().WithPriority(TaskPriority::USER_VISIBLE)));
+      1, scheduler_->GetMaxConcurrentTasksWithTraitsDeprecated(
+             test::CreateTaskTraits().WithPriority(TaskPriority::BACKGROUND)));
+  EXPECT_EQ(3, scheduler_->GetMaxConcurrentTasksWithTraitsDeprecated(
+                   test::CreateTaskTraits()
+                       .WithPriority(TaskPriority::BACKGROUND)
+                       .MayBlock()));
   EXPECT_EQ(
-      12,
+      4,
       scheduler_->GetMaxConcurrentTasksWithTraitsDeprecated(
-          TaskTraits().WithPriority(TaskPriority::USER_VISIBLE).MayBlock()));
-  EXPECT_EQ(4, scheduler_->GetMaxConcurrentTasksWithTraitsDeprecated(
-                   TaskTraits().WithPriority(TaskPriority::USER_BLOCKING)));
+          test::CreateTaskTraits().WithPriority(TaskPriority::USER_VISIBLE)));
+  EXPECT_EQ(12, scheduler_->GetMaxConcurrentTasksWithTraitsDeprecated(
+                    test::CreateTaskTraits()
+                        .WithPriority(TaskPriority::USER_VISIBLE)
+                        .MayBlock()));
   EXPECT_EQ(
-      12,
+      4,
       scheduler_->GetMaxConcurrentTasksWithTraitsDeprecated(
-          TaskTraits().WithPriority(TaskPriority::USER_BLOCKING).MayBlock()));
+          test::CreateTaskTraits().WithPriority(TaskPriority::USER_BLOCKING)));
+  EXPECT_EQ(12, scheduler_->GetMaxConcurrentTasksWithTraitsDeprecated(
+                    test::CreateTaskTraits()
+                        .WithPriority(TaskPriority::USER_BLOCKING)
+                        .MayBlock()));
 }
 
 // Verify that the RunsTasksOnCurrentThread() method of a SequencedTaskRunner
 // returns false when called from a task that isn't part of the sequence.
 TEST_F(TaskSchedulerImplTest, SequencedRunsTasksOnCurrentThread) {
   auto single_thread_task_runner =
-      scheduler_->CreateSingleThreadTaskRunnerWithTraits(TaskTraits());
+      scheduler_->CreateSingleThreadTaskRunnerWithTraits(
+          test::CreateTaskTraits());
   auto sequenced_task_runner =
-      scheduler_->CreateSequencedTaskRunnerWithTraits(TaskTraits());
+      scheduler_->CreateSequencedTaskRunnerWithTraits(test::CreateTaskTraits());
 
   WaitableEvent task_ran(WaitableEvent::ResetPolicy::MANUAL,
                          WaitableEvent::InitialState::NOT_SIGNALED);
@@ -330,9 +339,10 @@ TEST_F(TaskSchedulerImplTest, SequencedRunsTasksOnCurrentThread) {
 // returns false when called from a task that isn't part of the sequence.
 TEST_F(TaskSchedulerImplTest, SingleThreadRunsTasksOnCurrentThread) {
   auto sequenced_task_runner =
-      scheduler_->CreateSequencedTaskRunnerWithTraits(TaskTraits());
+      scheduler_->CreateSequencedTaskRunnerWithTraits(test::CreateTaskTraits());
   auto single_thread_task_runner =
-      scheduler_->CreateSingleThreadTaskRunnerWithTraits(TaskTraits());
+      scheduler_->CreateSingleThreadTaskRunnerWithTraits(
+          test::CreateTaskTraits());
 
   WaitableEvent task_ran(WaitableEvent::ResetPolicy::MANUAL,
                          WaitableEvent::InitialState::NOT_SIGNALED);
@@ -351,7 +361,7 @@ TEST_F(TaskSchedulerImplTest, SingleThreadRunsTasksOnCurrentThread) {
 #if defined(OS_WIN)
 TEST_F(TaskSchedulerImplTest, COMSTATaskRunnersRunWithCOMSTA) {
   auto com_sta_task_runner =
-      scheduler_->CreateCOMSTATaskRunnerWithTraits(TaskTraits());
+      scheduler_->CreateCOMSTATaskRunnerWithTraits(test::CreateTaskTraits());
 
   WaitableEvent task_ran(WaitableEvent::ResetPolicy::MANUAL,
                          WaitableEvent::InitialState::NOT_SIGNALED);