Do not inherit TaskPriority in TaskTraits.

base/task_scheduler/task_scheduler_impl_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/task_scheduler/task_scheduler_impl.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #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"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include <objbase.h>
@@ skipping 126 matching lines @@
   const test::ExecutionMode execution_modes[] = {
       test::ExecutionMode::PARALLEL, test::ExecutionMode::SEQUENCED,
       test::ExecutionMode::SINGLE_THREADED};
 
   for (test::ExecutionMode execution_mode : execution_modes) {
     for (size_t priority_index = static_cast<size_t>(TaskPriority::LOWEST);
          priority_index <= static_cast<size_t>(TaskPriority::HIGHEST);
          ++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));
     }
   }
 
   return params;
 }
 
 class TaskSchedulerImplTest
     : public testing::TestWithParam<TraitsExecutionModePair> {
  protected:
   TaskSchedulerImplTest() = default;
@@ skipping 96 matching lines @@
     threads_posting_tasks.back()->Start();
   }
 
   for (const auto& thread : threads_posting_tasks) {
     thread->WaitForAllTasksToRun();
     thread->Join();
   }
 }
 
 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);
   single_thread_task_runner->PostTask(
       FROM_HERE,
       BindOnce(
           [](scoped_refptr<TaskRunner> sequenced_task_runner,
              WaitableEvent* task_ran) {
             EXPECT_FALSE(sequenced_task_runner->RunsTasksOnCurrentThread());
             task_ran->Signal();
           },
           sequenced_task_runner, Unretained(&task_ran)));
   task_ran.Wait();
 }
 
 // Verify that the RunsTasksOnCurrentThread() method of a SingleThreadTaskRunner
 // 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);
   sequenced_task_runner->PostTask(
       FROM_HERE,
       BindOnce(
           [](scoped_refptr<TaskRunner> single_thread_task_runner,
              WaitableEvent* task_ran) {
             EXPECT_FALSE(single_thread_task_runner->RunsTasksOnCurrentThread());
             task_ran->Signal();
           },
           single_thread_task_runner, Unretained(&task_ran)));
   task_ran.Wait();
 }
 
 #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);
   com_sta_task_runner->PostTask(
       FROM_HERE,
       Bind(
           [](scoped_refptr<TaskRunner> single_thread_task_runner,
              WaitableEvent* task_ran) {
             HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
             if (SUCCEEDED(hr)) {
               ADD_FAILURE() << "COM STA was not initialized on this thread";
               CoUninitialize();
             }
             task_ran->Signal();
           },
           com_sta_task_runner, Unretained(&task_ran)));
   task_ran.Wait();
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace internal
 }  // namespace base