Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2840)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc

Issue 2831883003: Do not inherit TaskPriority in TaskTraits. (Closed)
Patch Set: self-review Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« base/task_scheduler/post_task.cc ('K') | « base/task_scheduler/post_task.cc ('k') | base/task_scheduler/scheduler_worker_pool_impl_unittest.cc » ('j') | base/task_scheduler/test_utils.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc
diff --git a/base/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc b/base/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc
index 7ff0c9d0a2709353f8407b91614b4da6c4c02678..903d68effc8f5c7f8a2affa21d53749fa526025a 100644
--- a/base/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc
+++ b/base/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc
@@ -14,6 +14,7 @@
#include "base/task_scheduler/scheduler_worker_pool_params.h"
#include "base/task_scheduler/task_tracker.h"
#include "base/task_scheduler/task_traits.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"
@@ -93,13 +94,13 @@ TEST_F(TaskSchedulerSingleThreadTaskRunnerManagerTest, DifferentThreadsUsed) {
single_thread_task_runner_manager_
->CreateSingleThreadTaskRunnerWithTraits(
"A", ThreadPriority::NORMAL,
- TaskTraits().WithShutdownBehavior(
+ test::CreateTaskTraits().WithShutdownBehavior(
TaskShutdownBehavior::BLOCK_SHUTDOWN));
scoped_refptr<SingleThreadTaskRunner> task_runner_2 =
single_thread_task_runner_manager_
->CreateSingleThreadTaskRunnerWithTraits(
"B", ThreadPriority::NORMAL,
- TaskTraits().WithShutdownBehavior(
+ test::CreateTaskTraits().WithShutdownBehavior(
TaskShutdownBehavior::BLOCK_SHUTDOWN));
PlatformThreadRef thread_ref_1;
@@ -124,12 +125,13 @@ TEST_F(TaskSchedulerSingleThreadTaskRunnerManagerTest, PrioritySetCorrectly) {
single_thread_task_runner_manager_
->CreateSingleThreadTaskRunnerWithTraits(
"Background", ThreadPriority::BACKGROUND,
- TaskTraits().WithPriority(TaskPriority::BACKGROUND));
+ test::CreateTaskTraits().WithPriority(TaskPriority::BACKGROUND));
scoped_refptr<SingleThreadTaskRunner> task_runner_normal =
single_thread_task_runner_manager_
->CreateSingleThreadTaskRunnerWithTraits(
"Normal", ThreadPriority::NORMAL,
- TaskTraits().WithPriority(TaskPriority::USER_VISIBLE));
+ test::CreateTaskTraits().WithPriority(
+ TaskPriority::USER_VISIBLE));
ThreadPriority thread_priority_background;
task_runner_background->PostTask(
@@ -162,9 +164,10 @@ TEST_F(TaskSchedulerSingleThreadTaskRunnerManagerTest, PrioritySetCorrectly) {
}
TEST_F(TaskSchedulerSingleThreadTaskRunnerManagerTest, PostTaskAfterShutdown) {
- auto task_runner = single_thread_task_runner_manager_
- ->CreateSingleThreadTaskRunnerWithTraits(
- "A", ThreadPriority::NORMAL, TaskTraits());
+ auto task_runner =
+ single_thread_task_runner_manager_
+ ->CreateSingleThreadTaskRunnerWithTraits("A", ThreadPriority::NORMAL,
+ test::CreateTaskTraits());
task_tracker_.Shutdown();
EXPECT_FALSE(task_runner->PostTask(FROM_HERE, BindOnce(&ShouldNotRun)));
}
@@ -176,9 +179,10 @@ TEST_F(TaskSchedulerSingleThreadTaskRunnerManagerTest, PostDelayedTask) {
// Post a task with a short delay.
WaitableEvent task_ran(WaitableEvent::ResetPolicy::MANUAL,
WaitableEvent::InitialState::NOT_SIGNALED);
- auto task_runner = single_thread_task_runner_manager_
- ->CreateSingleThreadTaskRunnerWithTraits(
- "A", ThreadPriority::NORMAL, TaskTraits());
+ auto task_runner =
+ single_thread_task_runner_manager_
+ ->CreateSingleThreadTaskRunnerWithTraits("A", ThreadPriority::NORMAL,
+ test::CreateTaskTraits());
EXPECT_TRUE(task_runner->PostDelayedTask(
FROM_HERE, BindOnce(&WaitableEvent::Signal, Unretained(&task_ran)),
TestTimeouts::tiny_timeout()));
@@ -200,13 +204,13 @@ TEST_F(TaskSchedulerSingleThreadTaskRunnerManagerTest,
single_thread_task_runner_manager_
->CreateSingleThreadTaskRunnerWithTraits(
"A", ThreadPriority::NORMAL,
- TaskTraits().WithShutdownBehavior(
+ test::CreateTaskTraits().WithShutdownBehavior(
TaskShutdownBehavior::BLOCK_SHUTDOWN));
scoped_refptr<SingleThreadTaskRunner> task_runner_2 =
single_thread_task_runner_manager_
->CreateSingleThreadTaskRunnerWithTraits(
"B", ThreadPriority::NORMAL,
- TaskTraits().WithShutdownBehavior(
+ test::CreateTaskTraits().WithShutdownBehavior(
TaskShutdownBehavior::BLOCK_SHUTDOWN));
EXPECT_FALSE(task_runner_1->RunsTasksOnCurrentThread());
@@ -287,10 +291,11 @@ TEST_F(TaskSchedulerSingleThreadTaskRunnerManagerJoinTest, ConcurrentJoin) {
WaitableEvent::InitialState::NOT_SIGNALED);
{
- auto task_runner = single_thread_task_runner_manager_
- ->CreateSingleThreadTaskRunnerWithTraits(
- "A", ThreadPriority::NORMAL,
- TaskTraits().WithBaseSyncPrimitives());
+ auto task_runner =
+ single_thread_task_runner_manager_
+ ->CreateSingleThreadTaskRunnerWithTraits(
+ "A", ThreadPriority::NORMAL,
+ test::CreateTaskTraits().WithBaseSyncPrimitives());
EXPECT_TRUE(task_runner->PostTask(
FROM_HERE,
BindOnce(&WaitableEvent::Signal, Unretained(&task_running))));
@@ -317,10 +322,11 @@ TEST_F(TaskSchedulerSingleThreadTaskRunnerManagerJoinTest,
WaitableEvent::InitialState::NOT_SIGNALED);
{
- auto task_runner = single_thread_task_runner_manager_
- ->CreateSingleThreadTaskRunnerWithTraits(
- "A", ThreadPriority::NORMAL,
- TaskTraits().WithBaseSyncPrimitives());
+ auto task_runner =
+ single_thread_task_runner_manager_
+ ->CreateSingleThreadTaskRunnerWithTraits(
+ "A", ThreadPriority::NORMAL,
+ test::CreateTaskTraits().WithBaseSyncPrimitives());
EXPECT_TRUE(task_runner->PostTask(
FROM_HERE,
BindOnce(&WaitableEvent::Signal, Unretained(&task_running))));
@@ -344,7 +350,7 @@ TEST_F(TaskSchedulerSingleThreadTaskRunnerManagerTest, COMSTAInitialized) {
scoped_refptr<SingleThreadTaskRunner> com_task_runner =
single_thread_task_runner_manager_->CreateCOMSTATaskRunnerWithTraits(
"A", ThreadPriority::NORMAL,
- TaskTraits().WithShutdownBehavior(
+ test::CreateTaskTraits().WithShutdownBehavior(
TaskShutdownBehavior::BLOCK_SHUTDOWN));
com_task_runner->PostTask(
@@ -408,7 +414,7 @@ TEST_F(TaskSchedulerSingleThreadTaskRunnerManagerTestWin, PumpsMessages) {
scoped_refptr<SingleThreadTaskRunner> com_task_runner =
single_thread_task_runner_manager_->CreateCOMSTATaskRunnerWithTraits(
"A", ThreadPriority::NORMAL,
- TaskTraits().WithShutdownBehavior(
+ test::CreateTaskTraits().WithShutdownBehavior(
TaskShutdownBehavior::BLOCK_SHUTDOWN));
HWND hwnd = nullptr;
// HWNDs process messages on the thread that created them, so we have to
@@ -461,7 +467,7 @@ TEST_F(TaskSchedulerSingleThreadTaskRunnerManagerStartTest,
WaitableEvent::InitialState::NOT_SIGNALED);
single_thread_task_runner_manager_
->CreateSingleThreadTaskRunnerWithTraits("A", ThreadPriority::NORMAL,
- TaskTraits())
+ test::CreateTaskTraits())
->PostTask(
FROM_HERE,
BindOnce(
« base/task_scheduler/post_task.cc ('K') | « base/task_scheduler/post_task.cc ('k') | base/task_scheduler/scheduler_worker_pool_impl_unittest.cc » ('j') | base/task_scheduler/test_utils.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698