Index: components/scheduler/base/task_queue_manager_unittest.cc |
diff --git a/components/scheduler/base/task_queue_manager_unittest.cc b/components/scheduler/base/task_queue_manager_unittest.cc |
index 251ac56523ae93077f53192525332fa6f95d4c9c..c3566c59eb3501ebff9ec927895123eaa119b80d 100644 |
--- a/components/scheduler/base/task_queue_manager_unittest.cc |
+++ b/components/scheduler/base/task_queue_manager_unittest.cc |
@@ -233,6 +233,7 @@ TEST_F(TaskQueueManagerTest, DelayedTaskPosting) { |
delay); |
EXPECT_EQ(delay, test_task_runner_->DelayToNextTaskTime()); |
EXPECT_TRUE(runners_[0]->IsQueueEmpty()); |
+ EXPECT_TRUE(runners_[0]->HasPendingDelayedTask()); |
EXPECT_TRUE(run_order.empty()); |
// The task doesn't run before the delay has completed. |
@@ -242,6 +243,7 @@ TEST_F(TaskQueueManagerTest, DelayedTaskPosting) { |
// After the delay has completed, the task runs normally. |
test_task_runner_->RunForPeriod(base::TimeDelta::FromMilliseconds(1)); |
EXPECT_THAT(run_order, ElementsAre(1)); |
+ EXPECT_FALSE(runners_[0]->HasPendingDelayedTask()); |
} |
bool MessageLoopTaskCounter(size_t* count) { |
@@ -1102,33 +1104,6 @@ TEST_F(TaskQueueManagerTest, DelayedTaskDoesNotSkipAHeadOfShorterDelayedTask) { |
EXPECT_THAT(run_order, ElementsAre(2, 1)); |
} |
-TEST_F(TaskQueueManagerTest, DelayedTaskWithAbsoluteRunTime) { |
- Initialize(1u); |
- |
- // One task in the past, two with the exact same run time and one in the |
- // future. |
- base::TimeDelta delay = base::TimeDelta::FromMilliseconds(10); |
- base::TimeTicks runTime1 = now_src_->NowTicks() - delay; |
- base::TimeTicks runTime2 = now_src_->NowTicks(); |
- base::TimeTicks runTime3 = now_src_->NowTicks(); |
- base::TimeTicks runTime4 = now_src_->NowTicks() + delay; |
- |
- std::vector<int> run_order; |
- runners_[0]->PostDelayedTaskAt( |
- FROM_HERE, base::Bind(&TestTask, 1, &run_order), runTime1); |
- runners_[0]->PostDelayedTaskAt( |
- FROM_HERE, base::Bind(&TestTask, 2, &run_order), runTime2); |
- runners_[0]->PostDelayedTaskAt( |
- FROM_HERE, base::Bind(&TestTask, 3, &run_order), runTime3); |
- runners_[0]->PostDelayedTaskAt( |
- FROM_HERE, base::Bind(&TestTask, 4, &run_order), runTime4); |
- |
- now_src_->Advance(2 * delay); |
- test_task_runner_->RunUntilIdle(); |
- |
- EXPECT_THAT(run_order, ElementsAre(1, 2, 3, 4)); |
-} |
- |
void CheckIsNested(bool* is_nested) { |
*is_nested = base::MessageLoop::current()->IsNested(); |
} |
@@ -1323,20 +1298,6 @@ TEST_F(TaskQueueManagerTest, OnUnregisterTaskQueue) { |
manager_->SetObserver(nullptr); |
} |
-TEST_F(TaskQueueManagerTest, ScheduleDelayedWorkIsNotReEntrant) { |
- Initialize(1u); |
- |
- // Post two tasks into the past. The second one used to trigger a deadlock |
- // because it tried to re-entrantly wake the first task in the same queue. |
- runners_[0]->PostDelayedTaskAt( |
- FROM_HERE, base::Bind(&NullTask), |
- base::TimeTicks() + base::TimeDelta::FromMicroseconds(100)); |
- runners_[0]->PostDelayedTaskAt( |
- FROM_HERE, base::Bind(&NullTask), |
- base::TimeTicks() + base::TimeDelta::FromMicroseconds(200)); |
- test_task_runner_->RunUntilIdle(); |
-} |
- |
void HasOneRefTask(std::vector<bool>* log, internal::TaskQueueImpl* tq) { |
log->push_back(tq->HasOneRef()); |
} |