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

components/scheduler/child/idle_helper_unittest.cc

 // Copyright 2015 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/idle_helper.h"
 
 #include "base/callback.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "cc/test/ordered_simple_task_runner.h"
+#include "components/scheduler/child/nestable_task_runner_for_test.h"
 #include "components/scheduler/child/scheduler_helper.h"
-#include "components/scheduler/child/scheduler_task_runner_delegate_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_manager.h"
 #include "components/scheduler/child/test_time_source.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::AnyNumber;
 using testing::AtLeast;
 using testing::Exactly;
 using testing::Invoke;
@@ skipping 95 matching lines @@
 void UpdateClockToDeadlineIdleTestTask(base::SimpleTestTickClock* clock,
                                        int* run_count,
                                        base::TimeTicks deadline) {
   UpdateClockIdleTestTask(clock, run_count, deadline, deadline);
 }
 
 void EndIdlePeriodIdleTask(IdleHelper* idle_helper, base::TimeTicks deadline) {
   idle_helper->EndIdlePeriod();
 }
 
-scoped_refptr<SchedulerTaskRunnerDelegate> CreateTaskRunnerDelegate(
+scoped_refptr<NestableSingleThreadTaskRunner>
+CreateNestableSingleThreadTaskRunner(
     base::MessageLoop* message_loop,
     scoped_refptr<cc::OrderedSimpleTaskRunner> mock_task_runner) {
   if (message_loop)
-    return SchedulerTaskRunnerDelegateImpl::Create(message_loop);
+    return SchedulerMessageLoopDelegate::Create(message_loop);
 
-  return SchedulerTaskRunnerDelegateForTest::Create(mock_task_runner);
+  return NestableTaskRunnerForTest::Create(mock_task_runner);
 }
 
 };  // namespace
 
 class IdleHelperForTest : public IdleHelper, public IdleHelper::Delegate {
  public:
   explicit IdleHelperForTest(
       SchedulerHelper* scheduler_helper,
       base::TimeDelta required_quiescence_duration_before_long_idle_period)
       : IdleHelper(scheduler_helper,
@@ skipping 20 matching lines @@
  public:
   BaseIdleHelperTest(
       base::MessageLoop* message_loop,
       base::TimeDelta required_quiescence_duration_before_long_idle_period)
       : clock_(new base::SimpleTestTickClock()),
         mock_task_runner_(
             message_loop
                 ? nullptr
                 : new cc::OrderedSimpleTaskRunner(clock_.get(), false)),
         message_loop_(message_loop),
-        main_task_runner_(
-            CreateTaskRunnerDelegate(message_loop, mock_task_runner_)),
+        nestable_task_runner_(
+            CreateNestableSingleThreadTaskRunner(message_loop,
+                                                 mock_task_runner_)),
         scheduler_helper_(
-            new SchedulerHelper(main_task_runner_,
+            new SchedulerHelper(nestable_task_runner_,
                                 "test.idle",
                                 TRACE_DISABLED_BY_DEFAULT("test.idle"),
                                 TRACE_DISABLED_BY_DEFAULT("test.idle.debug"),
                                 SchedulerHelper::TASK_QUEUE_COUNT + 1)),
         idle_helper_(new IdleHelperForTest(
             scheduler_helper_.get(),
             required_quiescence_duration_before_long_idle_period)),
         default_task_runner_(scheduler_helper_->DefaultTaskRunner()),
         idle_task_runner_(idle_helper_->IdleTaskRunner()) {
     clock_->Advance(base::TimeDelta::FromMicroseconds(5000));
@@ skipping 79 matching lines @@
   void CheckIdlePeriodStateIs(const char* expected) {
     EXPECT_STREQ(expected, IdleHelper::IdlePeriodStateToString(
                                idle_helper_->SchedulerIdlePeriodState()));
   }
 
   scoped_ptr<base::SimpleTestTickClock> clock_;
   // Only one of mock_task_runner_ or message_loop_ will be set.
   scoped_refptr<cc::OrderedSimpleTaskRunner> mock_task_runner_;
   scoped_ptr<base::MessageLoop> message_loop_;
 
-  scoped_refptr<SchedulerTaskRunnerDelegate> main_task_runner_;
+  scoped_refptr<NestableSingleThreadTaskRunner> nestable_task_runner_;
   scoped_ptr<SchedulerHelper> scheduler_helper_;
   scoped_ptr<IdleHelperForTest> idle_helper_;
   scoped_refptr<base::SingleThreadTaskRunner> default_task_runner_;
   scoped_refptr<SingleThreadIdleTaskRunner> idle_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseIdleHelperTest);
 };
 
 class IdleHelperTest : public BaseIdleHelperTest {
  public:
@@ skipping 847 matching lines @@
   EXPECT_EQ(0, run_count);
 
   default_task_runner_->PostDelayedTask(FROM_HERE, base::Bind(&NullTask),
                                         more_than_min_deadline_duration);
   idle_helper_->EnableLongIdlePeriod();
   RunUntilIdle();
   EXPECT_EQ(1, run_count);
 }
 
 }  // namespace scheduler