scheduler: Implement task observers

content/renderer/scheduler/task_queue_manager_unittest.cc

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..030ffe3e15ac2b398f41122060455a839a648972 100644
--- a/content/renderer/scheduler/task_queue_manager_unittest.cc
+++ b/content/renderer/scheduler/task_queue_manager_unittest.cc
@@ -582,5 +582,65 @@ 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, TaskObserverAdding) {
+  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());
+  EXPECT_EQ(2, observer.CallsToDidProcess());
+}
+
+TEST_F(TaskQueueManagerTest, TaskObserverRemoving) {
+  Initialize(1u);
+  TestTaskObserver observer;
+  manager_->AddTaskObserver(&observer);
+  manager_->RemoveTaskObserver(&observer);

[rmcilroy, 2015/02/13 12:53:22]

nit - could you add a test where the observer is removed from within a task, and
ensure CallsToWillProcess incremented by CallsToDidProcess didn't (no idea if we
care about this, but seems like an edge case).

[Sami, 2015/02/13 14:27:26]

Good idea, done.

+
+  std::vector<int> run_order;
+  scoped_refptr<base::SingleThreadTaskRunner> runner =
+      manager_->TaskRunnerForQueue(0);
+
+  runner->PostTask(FROM_HERE, base::Bind(&TestTask, 1, &run_order));
+
+  selector_->AppendQueueToService(0);
+  test_task_runner_->RunUntilIdle();
+
+  EXPECT_EQ(0, observer.CallsToWillProcess());
+  EXPECT_EQ(0, observer.CallsToDidProcess());
+}
+
 }  // namespace
 }  // namespace content