Revert of Redirect the MessageLoop's task runner to the renderer scheduler

components/scheduler/child/task_queue_manager_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/scheduler/child/task_queue_manager.h"
 
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/threading/thread.h"
 #include "cc/test/ordered_simple_task_runner.h"
 #include "components/scheduler/child/nestable_task_runner_for_test.h"
-#include "components/scheduler/child/scheduler_task_runner_delegate_impl.h"
+#include "components/scheduler/child/scheduler_message_loop_delegate.h"
 #include "components/scheduler/child/task_queue_selector.h"
 #include "components/scheduler/child/test_time_source.h"
 #include "components/scheduler/test/test_always_fail_time_source.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::ElementsAre;
 using testing::_;
 
 namespace scheduler {
 namespace {
@@ skipping 102 matching lines @@
   enum class SelectorType {
     Automatic,
     Explicit,
   };
 
   void Initialize(size_t num_queues, SelectorType type) {
     now_src_.reset(new base::SimpleTestTickClock());
     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, main_task_runner_, selector_.get(),
-                             "test.scheduler", "test.scheduler.debug"));
+    manager_ = make_scoped_ptr(new TaskQueueManager(
+        num_queues, NestableTaskRunnerForTest::Create(test_task_runner_.get()),
+        selector_.get(), "test.scheduler", "test.scheduler.debug"));
     manager_->SetTimeSourceForTesting(
         make_scoped_ptr(new TestTimeSource(now_src_.get())));
 
     EXPECT_EQ(num_queues, selector_->work_queues().size());
   }
 
   void InitializeWithRealMessageLoop(size_t num_queues, SelectorType type) {
     message_loop_.reset(new base::MessageLoop());
     selector_ = make_scoped_ptr(createSelectorForTest(type));
     manager_ = make_scoped_ptr(new TaskQueueManager(
-        num_queues,
-        SchedulerTaskRunnerDelegateImpl::Create(message_loop_.get()),
+        num_queues, SchedulerMessageLoopDelegate::Create(message_loop_.get()),
         selector_.get(), "test.scheduler", "test.scheduler.debug"));
     EXPECT_EQ(num_queues, selector_->work_queues().size());
   }
 
   SelectorForTest* createSelectorForTest(SelectorType type) {
     switch (type) {
       case SelectorType::Automatic:
         return new AutomaticSelectorForTest();
 
       case SelectorType::Explicit:
@@ skipping 20 matching lines @@
         &TaskQueueManager::PumpPolicyToString);
   }
 
   static void CheckAllWakeupPolicyToString() {
     CallForEachEnumValue<TaskQueueManager::WakeupPolicy>(
         TaskQueueManager::WakeupPolicy::FIRST_WAKEUP_POLICY,
         TaskQueueManager::WakeupPolicy::WAKEUP_POLICY_COUNT,
         &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,
                            base::SingleThreadTaskRunner* runner,
                            std::vector<std::pair<base::Closure, bool>>* tasks) {
   base::MessageLoop::ScopedNestableTaskAllower allow(message_loop);
   for (std::pair<base::Closure, bool>& pair : *tasks) {
     if (pair.second) {
       runner->PostTask(FROM_HERE, pair.first);
     } else {
@@ skipping 1085 matching lines @@
   runners[1]->PostDelayedTask(FROM_HERE, base::Bind(&TestTask, 2, &run_order),
                               delay2);
 
   now_src_->Advance(delay1 * 2);
   test_task_runner_->RunUntilIdle();
 
   EXPECT_THAT(run_order, ElementsAre(2, 1));
 }
 
 }  // namespace scheduler