Index: base/task_scheduler/scheduler_worker_pool_impl_unittest.cc |
diff --git a/base/task_scheduler/scheduler_worker_pool_impl_unittest.cc b/base/task_scheduler/scheduler_worker_pool_impl_unittest.cc |
index 33efcef38e950574e0c6e74fa409d05bf202ca05..0a0b5f5362176ebfe3b407681061f4158089d203 100644 |
--- a/base/task_scheduler/scheduler_worker_pool_impl_unittest.cc |
+++ b/base/task_scheduler/scheduler_worker_pool_impl_unittest.cc |
@@ -124,7 +124,7 @@ scoped_refptr<TaskRunner> CreateTaskRunnerWithExecutionMode( |
SchedulerWorkerPoolImpl* worker_pool, |
test::ExecutionMode execution_mode) { |
// Allow tasks posted to the returned TaskRunner to wait on a WaitableEvent. |
- const TaskTraits traits = TaskTraits().WithBaseSyncPrimitives(); |
+ const TaskTraits traits = test::CreateTaskTraits().WithBaseSyncPrimitives(); |
switch (execution_mode) { |
case test::ExecutionMode::PARALLEL: |
return worker_pool->CreateTaskRunnerWithTraits(traits); |
@@ -362,7 +362,8 @@ TEST_P(TaskSchedulerWorkerPoolImplTest, SequencedRunsTasksOnCurrentThread) { |
auto task_runner = |
CreateTaskRunnerWithExecutionMode(worker_pool_.get(), GetParam()); |
auto sequenced_task_runner = |
- worker_pool_->CreateSequencedTaskRunnerWithTraits(TaskTraits()); |
+ worker_pool_->CreateSequencedTaskRunnerWithTraits( |
+ test::CreateTaskTraits()); |
WaitableEvent task_ran(WaitableEvent::ResetPolicy::MANUAL, |
WaitableEvent::InitialState::NOT_SIGNALED); |
@@ -425,12 +426,14 @@ TEST_F(TaskSchedulerWorkerPoolImplPostTaskBeforeStartTest, |
WaitableEvent::InitialState::NOT_SIGNALED); |
worker_pool_ |
- ->CreateTaskRunnerWithTraits(TaskTraits().WithBaseSyncPrimitives()) |
+ ->CreateTaskRunnerWithTraits( |
+ test::CreateTaskTraits().WithBaseSyncPrimitives()) |
->PostTask(FROM_HERE, |
Bind(&TaskPostedBeforeStart, Unretained(&task_1_thread_ref), |
Unretained(&task_1_scheduled), Unretained(&barrier))); |
worker_pool_ |
- ->CreateTaskRunnerWithTraits(TaskTraits().WithBaseSyncPrimitives()) |
+ ->CreateTaskRunnerWithTraits( |
+ test::CreateTaskTraits().WithBaseSyncPrimitives()) |
->PostTask(FROM_HERE, |
Bind(&TaskPostedBeforeStart, Unretained(&task_2_thread_ref), |
Unretained(&task_2_scheduled), Unretained(&barrier))); |
@@ -503,7 +506,7 @@ TEST_F(TaskSchedulerWorkerPoolCheckTlsReuse, CheckDetachedThreads) { |
for (size_t i = 0; i < kNumWorkersInWorkerPool; ++i) { |
factories.push_back(MakeUnique<test::TestTaskFactory>( |
worker_pool_->CreateTaskRunnerWithTraits( |
- TaskTraits().WithBaseSyncPrimitives()), |
+ test::CreateTaskTraits().WithBaseSyncPrimitives()), |
test::ExecutionMode::PARALLEL)); |
ASSERT_TRUE(factories.back()->PostTask( |
PostNestedTask::NO, |
@@ -575,7 +578,7 @@ TEST_F(TaskSchedulerWorkerPoolHistogramTest, NumTasksBetweenWaits) { |
WaitableEvent::InitialState::NOT_SIGNALED); |
CreateAndStartWorkerPool(TimeDelta::Max(), kNumWorkersInWorkerPool); |
auto task_runner = worker_pool_->CreateSequencedTaskRunnerWithTraits( |
- TaskTraits().WithBaseSyncPrimitives()); |
+ test::CreateTaskTraits().WithBaseSyncPrimitives()); |
// Post a task. |
task_runner->PostTask(FROM_HERE, |
@@ -619,7 +622,7 @@ TEST_F(TaskSchedulerWorkerPoolHistogramTest, NumTasksBetweenWaitsWithDetach) { |
WaitableEvent::InitialState::NOT_SIGNALED); |
CreateAndStartWorkerPool(kReclaimTimeForDetachTests, kNumWorkersInWorkerPool); |
auto task_runner = worker_pool_->CreateTaskRunnerWithTraits( |
- TaskTraits().WithBaseSyncPrimitives()); |
+ test::CreateTaskTraits().WithBaseSyncPrimitives()); |
// Post tasks to saturate the pool. |
std::vector<std::unique_ptr<WaitableEvent>> task_started_events; |
@@ -683,7 +686,7 @@ TEST_F(TaskSchedulerWorkerPoolHistogramTest, NumTasksBeforeDetach) { |
auto histogrammed_thread_task_runner = |
worker_pool_->CreateSequencedTaskRunnerWithTraits( |
- TaskTraits().WithBaseSyncPrimitives()); |
+ test::CreateTaskTraits().WithBaseSyncPrimitives()); |
// Post 3 tasks and hold the thread for idle thread stack ordering. |
// This test assumes |histogrammed_thread_task_runner| gets assigned the same |
@@ -741,7 +744,7 @@ TEST_F(TaskSchedulerWorkerPoolHistogramTest, NumTasksBeforeDetach) { |
WaitableEvent::InitialState::NOT_SIGNALED); |
auto task_runner_for_top_idle = |
worker_pool_->CreateSequencedTaskRunnerWithTraits( |
- TaskTraits().WithBaseSyncPrimitives()); |
+ test::CreateTaskTraits().WithBaseSyncPrimitives()); |
task_runner_for_top_idle->PostTask( |
FROM_HERE, BindOnce( |
[](PlatformThreadRef thread_ref, |