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

components/scheduler/child/webthread_impl_for_worker_scheduler.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/webthread_impl_for_worker_scheduler.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
+#include "components/scheduler/child/scheduler_message_loop_delegate.h"
 #include "components/scheduler/child/web_scheduler_impl.h"
 #include "components/scheduler/child/worker_scheduler_impl.h"
 #include "third_party/WebKit/public/platform/WebTraceLocation.h"
 
 namespace scheduler {
 
 WebThreadImplForWorkerScheduler::WebThreadImplForWorkerScheduler(
     const char* name)
     : thread_(new base::Thread(name)) {
   thread_->Start();
-  thread_task_runner_ = thread_->task_runner();
 
   base::WaitableEvent completion(false, false);
-  thread_task_runner_->PostTask(
+  thread_->task_runner()->PostTask(
       FROM_HERE, base::Bind(&WebThreadImplForWorkerScheduler::InitOnThread,
                             base::Unretained(this), &completion));
   completion.Wait();
 }
 
 WebThreadImplForWorkerScheduler::~WebThreadImplForWorkerScheduler() {
-  base::WaitableEvent completion(false, false);
-  // Shut down the scheduler on the thread to restore the original task runner
-  // so that the thread can tear itself down.
-  thread_task_runner_->PostTask(
-      FROM_HERE, base::Bind(&WebThreadImplForWorkerScheduler::ShutdownOnThread,
-                            base::Unretained(this), &completion));
-  completion.Wait();
   thread_->Stop();
 }
 
 void WebThreadImplForWorkerScheduler::InitOnThread(
     base::WaitableEvent* completion) {
   worker_scheduler_ = WorkerScheduler::Create(thread_->message_loop());
   worker_scheduler_->Init();
   task_runner_ = worker_scheduler_->DefaultTaskRunner();
   idle_task_runner_ = worker_scheduler_->IdleTaskRunner();
   web_scheduler_.reset(new WebSchedulerImpl(
       worker_scheduler_.get(), worker_scheduler_->IdleTaskRunner(),
       worker_scheduler_->DefaultTaskRunner(),
       worker_scheduler_->DefaultTaskRunner()));
   base::MessageLoop::current()->AddDestructionObserver(this);
   completion->Signal();
 }
 
-void WebThreadImplForWorkerScheduler::ShutdownOnThread(
-    base::WaitableEvent* completion) {
-  worker_scheduler_->Shutdown();
-  completion->Signal();
-}
-
 void WebThreadImplForWorkerScheduler::WillDestroyCurrentMessageLoop() {
   task_runner_ = nullptr;
   idle_task_runner_ = nullptr;
   web_scheduler_.reset();
   worker_scheduler_.reset();
 }
 
 blink::PlatformThreadId WebThreadImplForWorkerScheduler::threadId() const {
   return thread_->thread_id();
 }
@@ skipping 16 matching lines @@
     base::MessageLoop::TaskObserver* observer) {
   worker_scheduler_->AddTaskObserver(observer);
 }
 
 void WebThreadImplForWorkerScheduler::RemoveTaskObserverInternal(
     base::MessageLoop::TaskObserver* observer) {
   worker_scheduler_->RemoveTaskObserver(observer);
 }
 
 }  // namespace scheduler