content: Add an overridable task runner to ChildThreadImpl

content/renderer/render_thread_impl.cc

 // Copyright (c) 2012 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 "content/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 414 matching lines @@
     blink::mainThreadIsolate()->SetCreateHistogramFunction(CreateHistogram);
   }
 }
 
 RenderThreadImpl* RenderThreadImpl::current() {
   return lazy_tls.Pointer()->Get();
 }
 
 // When we run plugins in process, we actually run them on the render thread,
 // which means that we need to make the render thread pump UI events.
-RenderThreadImpl::RenderThreadImpl()
-    : ChildThreadImpl(Options::Builder()
-                          .InBrowserProcess(true)
-                          .UseMojoChannel(ShouldUseMojoChannel())
-                          .Build()) {
-  Init();
-}
-
-RenderThreadImpl::RenderThreadImpl(const std::string& channel_name)
-    : ChildThreadImpl(Options::Builder()
-                          .InBrowserProcess(true)
-                          .UseMojoChannel(ShouldUseMojoChannel())
-                          .WithChannelName(channel_name)
-                          .Build()) {
+RenderThreadImpl::RenderThreadImpl(
+    scoped_ptr<RendererScheduler> renderer_scheduler)
+    : ChildThreadImpl(
+          Options::Builder()
+              .InBrowserProcess(true)
+              .UseMojoChannel(ShouldUseMojoChannel())
+              .WithTaskRunner(renderer_scheduler->DefaultTaskRunner())
+              .Build()),
+      renderer_scheduler_(renderer_scheduler.Pass()) {
   Init();
 }
 
 RenderThreadImpl::RenderThreadImpl(
-    scoped_ptr<base::MessageLoop> main_message_loop)
-    : ChildThreadImpl(Options::Builder()
-                          // TODO(skyostil): This should be set to false.
-                          .InBrowserProcess(true)
-                          .UseMojoChannel(ShouldUseMojoChannel())
-                          .Build()),
+    const std::string& channel_name,
+    scoped_ptr<RendererScheduler> renderer_scheduler)
+    : ChildThreadImpl(
+          Options::Builder()
+              .InBrowserProcess(true)
+              .UseMojoChannel(ShouldUseMojoChannel())
+              .WithChannelName(channel_name)
+              .WithTaskRunner(renderer_scheduler->DefaultTaskRunner())
+              .Build()),
+      renderer_scheduler_(renderer_scheduler.Pass()) {
+  Init();
+}
+
+RenderThreadImpl::RenderThreadImpl(
+    scoped_ptr<base::MessageLoop> main_message_loop,
+    scoped_ptr<RendererScheduler> renderer_scheduler)
+    : ChildThreadImpl(
+          Options::Builder()
+              // TODO(skyostil): This should be set to false.
+              .InBrowserProcess(true)
+              .UseMojoChannel(ShouldUseMojoChannel())
+              .WithTaskRunner(renderer_scheduler->DefaultTaskRunner())
+              .Build()),
+      renderer_scheduler_(renderer_scheduler.Pass()),
       main_message_loop_(main_message_loop.Pass()) {
   Init();
 }
 
 void RenderThreadImpl::Init() {
   TRACE_EVENT_BEGIN_ETW("RenderThreadImpl::Init", 0, "");
 
   base::trace_event::TraceLog::GetInstance()->SetThreadSortIndex(
       base::PlatformThread::CurrentId(),
       kTraceEventRendererMainThreadSortIndex);
@@ skipping 16 matching lines @@
   hidden_widget_count_ = 0;
   idle_notification_delay_in_ms_ = kInitialIdleHandlerDelayMs;
   idle_notifications_to_skip_ = 0;
   layout_test_mode_ = false;
 
   appcache_dispatcher_.reset(
       new AppCacheDispatcher(Get(), new AppCacheFrontendImpl()));
   dom_storage_dispatcher_.reset(new DomStorageDispatcher());
   main_thread_indexed_db_dispatcher_.reset(new IndexedDBDispatcher(
       thread_safe_sender()));
-  renderer_scheduler_ = RendererScheduler::Create();
   channel()->SetListenerTaskRunner(renderer_scheduler_->DefaultTaskRunner());
   embedded_worker_dispatcher_.reset(new EmbeddedWorkerDispatcher());
 
   // Note: This may reorder messages from the ResourceDispatcher with respect to
   // other subsystems.
   resource_dispatch_throttler_.reset(new ResourceDispatchThrottler(
       static_cast<RenderThread*>(this), renderer_scheduler_.get(),
       base::TimeDelta::FromSecondsD(kThrottledResourceRequestFlushPeriodS),
       kMaxResourceRequestsPerFlushWhenThrottled));
   resource_dispatcher()->set_message_sender(resource_dispatch_throttler_.get());
@@ skipping 1329 matching lines @@
     mojo::InterfaceRequest<mojo::ServiceProvider> services,
     mojo::ServiceProviderPtr exposed_services)
     : services(services.Pass()),
       exposed_services(exposed_services.Pass()) {
 }
 
 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() {
 }
 
 }  // namespace content