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

components/scheduler/child/worker_scheduler_impl_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/worker_scheduler_impl.h"
 
 #include "base/callback.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "cc/test/ordered_simple_task_runner.h"
-#include "components/scheduler/child/scheduler_task_runner_delegate_for_test.h"
+#include "components/scheduler/child/nestable_task_runner_for_test.h"
+#include "components/scheduler/child/scheduler_message_loop_delegate.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::ElementsAreArray;
 
 namespace scheduler {
 
 namespace {
 void NopTask() {
@@ skipping 24 matching lines @@
                           base::TimeTicks deadline) {
   timeline->push_back(base::StringPrintf("run TimelineIdleTestTask deadline %d",
                                          TimeTicksToIntMs(deadline)));
 }
 
 };  // namespace
 
 class WorkerSchedulerImplForTest : public WorkerSchedulerImpl {
  public:
   WorkerSchedulerImplForTest(
-      scoped_refptr<SchedulerTaskRunnerDelegate> main_task_runner,
+      scoped_refptr<NestableSingleThreadTaskRunner> main_task_runner,
       base::SimpleTestTickClock* clock_)
       : WorkerSchedulerImpl(main_task_runner),
         clock_(clock_),
         timeline_(nullptr) {}
 
   void RecordTimelineEvents(std::vector<std::string>* timeline) {
     timeline_ = timeline;
   }
 
  private:
@@ skipping 18 matching lines @@
 
   base::SimpleTestTickClock* clock_;    // NOT OWNED
   std::vector<std::string>* timeline_;  // NOT OWNED
 };
 
 class WorkerSchedulerImplTest : public testing::Test {
  public:
   WorkerSchedulerImplTest()
       : clock_(new base::SimpleTestTickClock()),
         mock_task_runner_(new cc::OrderedSimpleTaskRunner(clock_.get(), true)),
-        main_task_runner_(
-            SchedulerTaskRunnerDelegateForTest::Create(mock_task_runner_)),
-        scheduler_(
-            new WorkerSchedulerImplForTest(main_task_runner_, clock_.get())),
+        nestable_task_runner_(
+            NestableTaskRunnerForTest::Create(mock_task_runner_)),
+        scheduler_(new WorkerSchedulerImplForTest(nestable_task_runner_,
+                                                  clock_.get())),
         timeline_(nullptr) {
     clock_->Advance(base::TimeDelta::FromMicroseconds(5000));
     scheduler_->GetSchedulerHelperForTesting()->SetTimeSourceForTesting(
         make_scoped_ptr(new TestTimeSource(clock_.get())));
     scheduler_->GetSchedulerHelperForTesting()
         ->GetTaskQueueManagerForTesting()
         ->SetTimeSourceForTesting(
             make_scoped_ptr(new TestTimeSource(clock_.get())));
   }
 
@@ skipping 59 matching lines @@
   static base::TimeDelta maximum_idle_period_duration() {
     return base::TimeDelta::FromMilliseconds(
         IdleHelper::kMaximumIdlePeriodMillis);
   }
 
  protected:
   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_refptr<SchedulerTaskRunnerDelegate> main_task_runner_;
+  scoped_refptr<NestableSingleThreadTaskRunner> nestable_task_runner_;
   scoped_ptr<WorkerSchedulerImplForTest> scheduler_;
   scoped_refptr<base::SingleThreadTaskRunner> default_task_runner_;
   scoped_refptr<SingleThreadIdleTaskRunner> idle_task_runner_;
   std::vector<std::string>* timeline_;  // NOT OWNED
 
   DISALLOW_COPY_AND_ASSIGN(WorkerSchedulerImplTest);
 };
 
 TEST_F(WorkerSchedulerImplTest, TestPostDefaultTask) {
   Init();
@@ skipping 190 matching lines @@
       "run RecordTimelineTask @ 55",
       "IsNotQuiescent @ 55",  // NOTE we have to wait for quiescence.
       "CanEnterLongIdlePeriod @ 355",
       "run TimelineIdleTestTask deadline 405",
       "RunUntilIdle end @ 355"};
 
   EXPECT_THAT(timeline, ElementsAreArray(expected_timeline));
 }
 
 }  // namespace scheduler