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

Unified Diff: third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc

Issue 2808843003: [scheduler] Change TaskQueue observer call mechanism. (Closed)
Patch Set: addressed comments Created 3 years, 7 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: third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc
diff --git a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc
index 68d0e537ce629a3553084542354bf512e224efd3..23149a1588ad116434810bb332d20a15061a9fcf 100644
--- a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc
@@ -359,9 +359,9 @@ TEST_F(TaskQueueManagerTest, HasPendingImmediateWork_ImmediateTask) {
Initialize(1u);
std::vector<EnqueueOrder> run_order;
- EXPECT_FALSE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_FALSE(runners_[0]->HasTaskToRunImmediately());
runners_[0]->PostTask(FROM_HERE, base::Bind(&TestTask, 1, &run_order));
- EXPECT_TRUE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_TRUE(runners_[0]->HasTaskToRunImmediately());
// Move the task into the |immediate_work_queue|.
EXPECT_TRUE(runners_[0]->immediate_work_queue()->Empty());
@@ -370,12 +370,12 @@ TEST_F(TaskQueueManagerTest, HasPendingImmediateWork_ImmediateTask) {
voter->SetQueueEnabled(false);
test_task_runner_->RunUntilIdle();
EXPECT_FALSE(runners_[0]->immediate_work_queue()->Empty());
- EXPECT_TRUE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_TRUE(runners_[0]->HasTaskToRunImmediately());
// Run the task, making the queue empty.
voter->SetQueueEnabled(true);
test_task_runner_->RunUntilIdle();
- EXPECT_FALSE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_FALSE(runners_[0]->HasTaskToRunImmediately());
}
TEST_F(TaskQueueManagerTest, HasPendingImmediateWork_DelayedTask) {
@@ -385,18 +385,18 @@ TEST_F(TaskQueueManagerTest, HasPendingImmediateWork_DelayedTask) {
base::TimeDelta delay(base::TimeDelta::FromMilliseconds(10));
runners_[0]->PostDelayedTask(FROM_HERE, base::Bind(&TestTask, 1, &run_order),
delay);
- EXPECT_FALSE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_FALSE(runners_[0]->HasTaskToRunImmediately());
now_src_->Advance(delay);
- EXPECT_TRUE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_TRUE(runners_[0]->HasTaskToRunImmediately());
// Move the task into the |delayed_work_queue|.
WakeUpReadyDelayedQueues(LazyNow(now_src_.get()));
EXPECT_FALSE(runners_[0]->delayed_work_queue()->Empty());
- EXPECT_TRUE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_TRUE(runners_[0]->HasTaskToRunImmediately());
// Run the task, making the queue empty.
test_task_runner_->RunUntilIdle();
- EXPECT_FALSE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_FALSE(runners_[0]->HasTaskToRunImmediately());
}
TEST_F(TaskQueueManagerTest, DelayedTaskPosting) {
@@ -407,7 +407,7 @@ TEST_F(TaskQueueManagerTest, DelayedTaskPosting) {
runners_[0]->PostDelayedTask(FROM_HERE, base::Bind(&TestTask, 1, &run_order),
delay);
EXPECT_EQ(delay, test_task_runner_->DelayToNextTaskTime());
- EXPECT_FALSE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_FALSE(runners_[0]->HasTaskToRunImmediately());
EXPECT_TRUE(run_order.empty());
// The task doesn't run before the delay has completed.
@@ -417,7 +417,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]->HasPendingImmediateWork());
+ EXPECT_FALSE(runners_[0]->HasTaskToRunImmediately());
}
bool MessageLoopTaskCounter(size_t* count) {
@@ -551,7 +551,7 @@ TEST_F(TaskQueueManagerTest, InsertAndRemoveFence) {
EXPECT_FALSE(test_task_runner_->HasPendingTasks());
// However polling still works.
- EXPECT_TRUE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_TRUE(runners_[0]->HasTaskToRunImmediately());
// After removing the fence the task runs normally.
runners_[0]->RemoveFence();
@@ -1134,34 +1134,34 @@ TEST_F(TaskQueueManagerTest, GetAndClearSystemIsQuiescentBit) {
TEST_F(TaskQueueManagerTest, HasPendingImmediateWork) {
Initialize(1u);
- EXPECT_FALSE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_FALSE(runners_[0]->HasTaskToRunImmediately());
runners_[0]->PostTask(FROM_HERE, base::Bind(NullTask));
- EXPECT_TRUE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_TRUE(runners_[0]->HasTaskToRunImmediately());
test_task_runner_->RunUntilIdle();
- EXPECT_FALSE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_FALSE(runners_[0]->HasTaskToRunImmediately());
}
TEST_F(TaskQueueManagerTest, HasPendingImmediateWork_DelayedTasks) {
Initialize(1u);
- EXPECT_FALSE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_FALSE(runners_[0]->HasTaskToRunImmediately());
runners_[0]->PostDelayedTask(FROM_HERE, base::Bind(NullTask),
base::TimeDelta::FromMilliseconds(12));
- EXPECT_FALSE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_FALSE(runners_[0]->HasTaskToRunImmediately());
// Move time forwards until just before the delayed task should run.
now_src_->Advance(base::TimeDelta::FromMilliseconds(10));
WakeUpReadyDelayedQueues(LazyNow(now_src_.get()));
- EXPECT_FALSE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_FALSE(runners_[0]->HasTaskToRunImmediately());
// Force the delayed task onto the work queue.
now_src_->Advance(base::TimeDelta::FromMilliseconds(2));
WakeUpReadyDelayedQueues(LazyNow(now_src_.get()));
- EXPECT_TRUE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_TRUE(runners_[0]->HasTaskToRunImmediately());
test_task_runner_->RunUntilIdle();
- EXPECT_FALSE(runners_[0]->HasPendingImmediateWork());
+ EXPECT_FALSE(runners_[0]->HasTaskToRunImmediately());
}
void ExpensiveTestTask(int value,

Powered by Google App Engine
This is Rietveld 408576698