| Index: base/task_scheduler/task_unittest.cc
|
| diff --git a/base/task_scheduler/task_unittest.cc b/base/task_scheduler/task_unittest.cc
|
| index e6a2c518a0a5e4e5c409a261949a9bd104cb9cd6..fb076d761bea261f68d378bc428aa373c7290bc8 100644
|
| --- a/base/task_scheduler/task_unittest.cc
|
| +++ b/base/task_scheduler/task_unittest.cc
|
| @@ -17,7 +17,7 @@ namespace internal {
|
| // adjusted to SKIP_ON_SHUTDOWN. The shutown behavior of other delayed tasks
|
| // should not change.
|
| TEST(TaskSchedulerTaskTest, ShutdownBehaviorChangeWithDelay) {
|
| - Task continue_on_shutdown(FROM_HERE, Bind(&DoNothing),
|
| + Task continue_on_shutdown(FROM_HERE, BindOnce(&DoNothing),
|
| TaskTraits().WithShutdownBehavior(
|
| TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN),
|
| TimeDelta::FromSeconds(1));
|
| @@ -25,14 +25,14 @@ TEST(TaskSchedulerTaskTest, ShutdownBehaviorChangeWithDelay) {
|
| continue_on_shutdown.traits.shutdown_behavior());
|
|
|
| Task skip_on_shutdown(
|
| - FROM_HERE, Bind(&DoNothing),
|
| + FROM_HERE, BindOnce(&DoNothing),
|
| TaskTraits().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, Bind(&DoNothing),
|
| + FROM_HERE, BindOnce(&DoNothing),
|
| TaskTraits().WithShutdownBehavior(TaskShutdownBehavior::BLOCK_SHUTDOWN),
|
| TimeDelta::FromSeconds(1));
|
| EXPECT_EQ(TaskShutdownBehavior::SKIP_ON_SHUTDOWN,
|
| @@ -41,7 +41,7 @@ TEST(TaskSchedulerTaskTest, ShutdownBehaviorChangeWithDelay) {
|
|
|
| // Verify that the shutdown behavior of undelayed tasks is not adjusted.
|
| TEST(TaskSchedulerTaskTest, NoShutdownBehaviorChangeNoDelay) {
|
| - Task continue_on_shutdown(FROM_HERE, Bind(&DoNothing),
|
| + Task continue_on_shutdown(FROM_HERE, BindOnce(&DoNothing),
|
| TaskTraits().WithShutdownBehavior(
|
| TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN),
|
| TimeDelta());
|
| @@ -49,14 +49,14 @@ TEST(TaskSchedulerTaskTest, NoShutdownBehaviorChangeNoDelay) {
|
| continue_on_shutdown.traits.shutdown_behavior());
|
|
|
| Task skip_on_shutdown(
|
| - FROM_HERE, Bind(&DoNothing),
|
| + FROM_HERE, BindOnce(&DoNothing),
|
| TaskTraits().WithShutdownBehavior(TaskShutdownBehavior::SKIP_ON_SHUTDOWN),
|
| TimeDelta());
|
| EXPECT_EQ(TaskShutdownBehavior::SKIP_ON_SHUTDOWN,
|
| skip_on_shutdown.traits.shutdown_behavior());
|
|
|
| Task block_shutdown(
|
| - FROM_HERE, Bind(&DoNothing),
|
| + FROM_HERE, BindOnce(&DoNothing),
|
| TaskTraits().WithShutdownBehavior(TaskShutdownBehavior::BLOCK_SHUTDOWN),
|
| TimeDelta());
|
| EXPECT_EQ(TaskShutdownBehavior::BLOCK_SHUTDOWN,
|
|
|