| 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 86f63272011d9b8b3846330c86d04c8bb6abf59a..fc5e4990fdaec2d412d87ff8369333292144f419 100644
|
| --- a/base/task_scheduler/scheduler_worker_pool_impl_unittest.cc
|
| +++ b/base/task_scheduler/scheduler_worker_pool_impl_unittest.cc
|
| @@ -84,8 +84,6 @@ class TaskSchedulerWorkerPoolImplTest
|
| base::MakeUnique<DelayedTaskManager>(service_thread_.task_runner());
|
| worker_pool_ = MakeUnique<SchedulerWorkerPoolImpl>(
|
| "TestWorkerPool", ThreadPriority::NORMAL,
|
| - Bind(&TaskSchedulerWorkerPoolImplTest::ReEnqueueSequenceCallback,
|
| - Unretained(this)),
|
| &task_tracker_, delayed_task_manager_.get());
|
| ASSERT_TRUE(worker_pool_);
|
| }
|
| @@ -110,14 +108,6 @@ class TaskSchedulerWorkerPoolImplTest
|
| std::unique_ptr<DelayedTaskManager> delayed_task_manager_;
|
|
|
| private:
|
| - void ReEnqueueSequenceCallback(scoped_refptr<Sequence> sequence) {
|
| - // In production code, this callback would be implemented by the
|
| - // TaskScheduler which would first determine which PriorityQueue the
|
| - // sequence must be re-enqueued.
|
| - const SequenceSortKey sort_key(sequence->GetSortKey());
|
| - worker_pool_->ReEnqueueSequence(std::move(sequence), sort_key);
|
| - }
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(TaskSchedulerWorkerPoolImplTest);
|
| };
|
|
|
| @@ -781,22 +771,12 @@ TEST_F(TaskSchedulerWorkerPoolHistogramTest, NumTasksBeforeDetach) {
|
| EXPECT_EQ(0, histogram->SnapshotSamples()->GetCount(10));
|
| }
|
|
|
| -namespace {
|
| -
|
| -void NotReachedReEnqueueSequenceCallback(scoped_refptr<Sequence> sequence) {
|
| - ADD_FAILURE()
|
| - << "Unexpected invocation of NotReachedReEnqueueSequenceCallback.";
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| TEST(TaskSchedulerWorkerPoolStandbyPolicyTest, InitLazy) {
|
| TaskTracker task_tracker;
|
| DelayedTaskManager delayed_task_manager(
|
| make_scoped_refptr(new TestSimpleTaskRunner));
|
| auto worker_pool = MakeUnique<SchedulerWorkerPoolImpl>(
|
| - "LazyPolicyWorkerPool", ThreadPriority::NORMAL,
|
| - Bind(&NotReachedReEnqueueSequenceCallback), &task_tracker,
|
| + "LazyPolicyWorkerPool", ThreadPriority::NORMAL, &task_tracker,
|
| &delayed_task_manager);
|
| worker_pool->Start(SchedulerWorkerPoolParams(StandbyThreadPolicy::LAZY, 8U,
|
| TimeDelta::Max()));
|
| @@ -810,8 +790,7 @@ TEST(TaskSchedulerWorkerPoolStandbyPolicyTest, InitOne) {
|
| DelayedTaskManager delayed_task_manager(
|
| make_scoped_refptr(new TestSimpleTaskRunner));
|
| auto worker_pool = MakeUnique<SchedulerWorkerPoolImpl>(
|
| - "OnePolicyWorkerPool", ThreadPriority::NORMAL,
|
| - Bind(&NotReachedReEnqueueSequenceCallback), &task_tracker,
|
| + "OnePolicyWorkerPool", ThreadPriority::NORMAL, &task_tracker,
|
| &delayed_task_manager);
|
| worker_pool->Start(SchedulerWorkerPoolParams(StandbyThreadPolicy::ONE, 8U,
|
| TimeDelta::Max()));
|
|
|