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

Unified Diff: base/task_scheduler/task_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
Index: base/task_scheduler/task_unittest.cc
diff --git a/base/task_scheduler/task_unittest.cc b/base/task_scheduler/task_unittest.cc
index fb076d761bea261f68d378bc428aa373c7290bc8..c1941e469d47493709ad5b8ef54c747a3a53cd03 100644
--- a/base/task_scheduler/task_unittest.cc
+++ b/base/task_scheduler/task_unittest.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/task_scheduler/task_traits.h"
+#include "base/task_scheduler/test_utils.h"
#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -18,23 +19,23 @@ namespace internal {
// should not change.
TEST(TaskSchedulerTaskTest, ShutdownBehaviorChangeWithDelay) {
Task continue_on_shutdown(FROM_HERE, BindOnce(&DoNothing),
- TaskTraits().WithShutdownBehavior(
+ test::CreateTaskTraits().WithShutdownBehavior(
TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN),
TimeDelta::FromSeconds(1));
EXPECT_EQ(TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN,
continue_on_shutdown.traits.shutdown_behavior());
- Task skip_on_shutdown(
- FROM_HERE, BindOnce(&DoNothing),
- TaskTraits().WithShutdownBehavior(TaskShutdownBehavior::SKIP_ON_SHUTDOWN),
- TimeDelta::FromSeconds(1));
+ Task skip_on_shutdown(FROM_HERE, BindOnce(&DoNothing),
+ test::CreateTaskTraits().WithShutdownBehavior(
+ TaskShutdownBehavior::SKIP_ON_SHUTDOWN),
+ TimeDelta::FromSeconds(1));
EXPECT_EQ(TaskShutdownBehavior::SKIP_ON_SHUTDOWN,
skip_on_shutdown.traits.shutdown_behavior());
- Task block_shutdown(
- FROM_HERE, BindOnce(&DoNothing),
- TaskTraits().WithShutdownBehavior(TaskShutdownBehavior::BLOCK_SHUTDOWN),
- TimeDelta::FromSeconds(1));
+ Task block_shutdown(FROM_HERE, BindOnce(&DoNothing),
+ test::CreateTaskTraits().WithShutdownBehavior(
+ TaskShutdownBehavior::BLOCK_SHUTDOWN),
+ TimeDelta::FromSeconds(1));
EXPECT_EQ(TaskShutdownBehavior::SKIP_ON_SHUTDOWN,
block_shutdown.traits.shutdown_behavior());
}
@@ -42,23 +43,23 @@ TEST(TaskSchedulerTaskTest, ShutdownBehaviorChangeWithDelay) {
// Verify that the shutdown behavior of undelayed tasks is not adjusted.
TEST(TaskSchedulerTaskTest, NoShutdownBehaviorChangeNoDelay) {
Task continue_on_shutdown(FROM_HERE, BindOnce(&DoNothing),
- TaskTraits().WithShutdownBehavior(
+ test::CreateTaskTraits().WithShutdownBehavior(
TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN),
TimeDelta());
EXPECT_EQ(TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN,
continue_on_shutdown.traits.shutdown_behavior());
- Task skip_on_shutdown(
- FROM_HERE, BindOnce(&DoNothing),
- TaskTraits().WithShutdownBehavior(TaskShutdownBehavior::SKIP_ON_SHUTDOWN),
- TimeDelta());
+ Task skip_on_shutdown(FROM_HERE, BindOnce(&DoNothing),
+ test::CreateTaskTraits().WithShutdownBehavior(
+ TaskShutdownBehavior::SKIP_ON_SHUTDOWN),
+ TimeDelta());
EXPECT_EQ(TaskShutdownBehavior::SKIP_ON_SHUTDOWN,
skip_on_shutdown.traits.shutdown_behavior());
- Task block_shutdown(
- FROM_HERE, BindOnce(&DoNothing),
- TaskTraits().WithShutdownBehavior(TaskShutdownBehavior::BLOCK_SHUTDOWN),
- TimeDelta());
+ Task block_shutdown(FROM_HERE, BindOnce(&DoNothing),
+ test::CreateTaskTraits().WithShutdownBehavior(
+ TaskShutdownBehavior::BLOCK_SHUTDOWN),
+ TimeDelta());
EXPECT_EQ(TaskShutdownBehavior::BLOCK_SHUTDOWN,
block_shutdown.traits.shutdown_behavior());
}

Powered by Google App Engine
This is Rietveld 408576698