Index: content/renderer/scheduler/task_queue_manager_unittest.cc |
diff --git a/content/renderer/scheduler/task_queue_manager_unittest.cc b/content/renderer/scheduler/task_queue_manager_unittest.cc |
index 62e6c349c372dd16a92bd74488a27f23eaf3743a..b4f29c4fa0f76cbd36ed31908dd0efd4bd3b9f48 100644 |
--- a/content/renderer/scheduler/task_queue_manager_unittest.cc |
+++ b/content/renderer/scheduler/task_queue_manager_unittest.cc |
@@ -582,5 +582,54 @@ TEST_F(TaskQueueManagerTest, InterruptWorkBatchForDelayedTask) { |
EXPECT_THAT(run_order, ElementsAre(2, 3, 1)); |
} |
+class TestTaskObserver : public base::MessageLoop::TaskObserver { |
+ public: |
+ TestTaskObserver() : will_count_(0), did_count_(0) {} |
+ |
+ void DidProcessTask(const base::PendingTask& task) override { did_count_++; } |
+ |
+ void WillProcessTask(const base::PendingTask& task) override { |
+ will_count_++; |
+ } |
+ |
+ int CallsToWillProcess() const { return will_count_; } |
+ int CallsToDidProcess() const { return did_count_; } |
+ |
+ private: |
+ int will_count_; |
+ int did_count_; |
+}; |
+ |
+TEST_F(TaskQueueManagerTest, TaskObserver) { |
+ Initialize(1u); |
+ TestTaskObserver observer; |
+ |
+ EXPECT_EQ(0, observer.CallsToWillProcess()); |
+ EXPECT_EQ(0, observer.CallsToDidProcess()); |
+ manager_->AddTaskObserver(&observer); |
+ |
+ std::vector<int> run_order; |
+ scoped_refptr<base::SingleThreadTaskRunner> runner = |
+ manager_->TaskRunnerForQueue(0); |
+ |
+ runner->PostTask(FROM_HERE, base::Bind(&TestTask, 1, &run_order)); |
+ runner->PostTask(FROM_HERE, base::Bind(&TestTask, 2, &run_order)); |
+ |
+ selector_->AppendQueueToService(0); |
+ selector_->AppendQueueToService(0); |
+ test_task_runner_->RunUntilIdle(); |
+ |
+ EXPECT_EQ(2, observer.CallsToWillProcess()); |
alex clarke (OOO till 29th)
2015/02/13 11:02:07
Should this be split up into multiple tests so it'
Sami
2015/02/13 12:09:09
Good idea. I've split this into one test for addin
|
+ EXPECT_EQ(2, observer.CallsToDidProcess()); |
+ |
+ manager_->RemoveTaskObserver(&observer); |
+ runner->PostTask(FROM_HERE, base::Bind(&TestTask, 3, &run_order)); |
+ selector_->AppendQueueToService(0); |
+ test_task_runner_->RunUntilIdle(); |
+ |
+ EXPECT_EQ(2, observer.CallsToWillProcess()); |
+ EXPECT_EQ(2, observer.CallsToDidProcess()); |
+} |
+ |
} // namespace |
} // namespace content |