Redirect the MessageLoop's task runner to the renderer scheduler

components/scheduler/child/task_queue_manager_unittest.cc

Index: components/scheduler/child/task_queue_manager_unittest.cc
diff --git a/components/scheduler/child/task_queue_manager_unittest.cc b/components/scheduler/child/task_queue_manager_unittest.cc
index d5af6e42f2ce2f3ca97f543e49885827adf9f19c..e500ecd5a86bc6ed8c01c0a19831e0dbe9588ff7 100644
--- a/components/scheduler/child/task_queue_manager_unittest.cc
+++ b/components/scheduler/child/task_queue_manager_unittest.cc
@@ -122,10 +122,12 @@ class TaskQueueManagerTest : public testing::Test {
     now_src_->Advance(base::TimeDelta::FromMicroseconds(1000));
     test_task_runner_ = make_scoped_refptr(
         new cc::OrderedSimpleTaskRunner(now_src_.get(), false));
+    main_task_runner_ =
+        NestableTaskRunnerForTest::Create(test_task_runner_.get());
     selector_ = make_scoped_ptr(createSelectorForTest(type));
-    manager_ = make_scoped_ptr(new TaskQueueManager(
-        num_queues, NestableTaskRunnerForTest::Create(test_task_runner_.get()),
-        selector_.get(), "test.scheduler", "test.scheduler.debug"));
+    manager_ = make_scoped_ptr(
+        new TaskQueueManager(num_queues, main_task_runner_, selector_.get(),
+                             "test.scheduler", "test.scheduler.debug"));
     manager_->SetTimeSourceForTesting(
         make_scoped_ptr(new TestTimeSource(now_src_.get())));
 
@@ -177,11 +179,12 @@ class TaskQueueManagerTest : public testing::Test {
         &TaskQueueManager::WakeupPolicyToString);
   }
 
+  scoped_ptr<base::MessageLoop> message_loop_;
   scoped_ptr<base::SimpleTestTickClock> now_src_;
+  scoped_refptr<NestableTaskRunnerForTest> main_task_runner_;
   scoped_refptr<cc::OrderedSimpleTaskRunner> test_task_runner_;
   scoped_ptr<SelectorForTest> selector_;
   scoped_ptr<TaskQueueManager> manager_;
-  scoped_ptr<base::MessageLoop> message_loop_;
 };
 
 void PostFromNestedRunloop(base::MessageLoop* message_loop,
@@ -1242,4 +1245,10 @@ TEST_F(TaskQueueManagerTest, GetQueueState) {
             manager_->GetQueueState(1));
 }
 
+TEST_F(TaskQueueManagerTest, DefaultTaskRunnerRegistration) {
+  Initialize(1u, SelectorType::Automatic);
+  EXPECT_EQ(main_task_runner_->default_task_runner(),
+            manager_->TaskRunnerForQueue(0));
+}
+

[alex clarke (OOO till 29th), 2015/07/08 13:30:53]

Can we have a test to ensure the original task runner is restored when the TQM
goes away?

[Sami, 2015/07/08 18:45:07]

Done.

[alex clarke (OOO till 29th), 2015/07/10 15:21:11]

Not seeing the test, does it still make sense to have it? (presumably not here
though).

[Sami, 2015/07/10 15:35:12]

That one's now in
components/scheduler/child/scheduler_task_runner_delegate_impl_unittest.cc.

 }  // namespace scheduler