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

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

Issue 2258713004: Make tasks cancellable inside the blink scheduler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Various comment nits addressed Created 4 years, 4 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_selector_unittest.cc
diff --git a/third_party/WebKit/Source/platform/scheduler/base/task_queue_selector_unittest.cc b/third_party/WebKit/Source/platform/scheduler/base/task_queue_selector_unittest.cc
index fb4790176a016802811d926fa80002f4dcbebc47..c39baaf527f1ac43004c90fe0ab836153bc356d5 100644
--- a/third_party/WebKit/Source/platform/scheduler/base/task_queue_selector_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue_selector_unittest.cc
@@ -388,9 +388,10 @@ TEST_F(TaskQueueSelectorTest, TestObserverWithOneBlockedQueue) {
task_queue->SetQueueEnabled(false);
selector.DisableQueue(task_queue.get());
- task_queue->immediate_work_queue()->PushAndSetEnqueueOrder(
- TaskQueueImpl::Task(FROM_HERE, test_closure_, base::TimeTicks(), 0, true),
- 0);
+ TaskQueueImpl::Task task(FROM_HERE, test_closure_, base::TimeTicks(), 0,
+ true);
+ task.set_enqueue_order(0);
+ task_queue->immediate_work_queue()->Push(std::move(task));
WorkQueue* chosen_work_queue;
EXPECT_CALL(mock_observer, OnTriedToSelectBlockedWorkQueue(_)).Times(1);
@@ -415,12 +416,14 @@ TEST_F(TaskQueueSelectorTest, TestObserverWithTwoBlockedQueues) {
selector.DisableQueue(task_queue2.get());
selector.SetQueuePriority(task_queue2.get(), TaskQueue::CONTROL_PRIORITY);
- task_queue->immediate_work_queue()->PushAndSetEnqueueOrder(
- TaskQueueImpl::Task(FROM_HERE, test_closure_, base::TimeTicks(), 0, true),
- 0);
- task_queue2->immediate_work_queue()->PushAndSetEnqueueOrder(
- TaskQueueImpl::Task(FROM_HERE, test_closure_, base::TimeTicks(), 0, true),
- 0);
+ TaskQueueImpl::Task task1(FROM_HERE, test_closure_, base::TimeTicks(), 0,
+ true);
+ TaskQueueImpl::Task task2(FROM_HERE, test_closure_, base::TimeTicks(), 1,
+ true);
+ task1.set_enqueue_order(0);
+ task2.set_enqueue_order(1);
+ task_queue->immediate_work_queue()->Push(std::move(task1));
+ task_queue2->immediate_work_queue()->Push(std::move(task2));
// Should still only see one call to OnTriedToSelectBlockedWorkQueue.
WorkQueue* chosen_work_queue;

Powered by Google App Engine
This is Rietveld 408576698