content: Add an overridable task runner to ChildThreadImpl

content/renderer/render_thread_impl.cc

Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 630ad6b45831fb9d531882660bc4377fb865827c..9b228697f9916c34fd505b0dff6b55debb9380a8 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -432,29 +432,42 @@ RenderThreadImpl* RenderThreadImpl::current() {
 
 // 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()) {
+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(const std::string& channel_name)
-    : ChildThreadImpl(Options::Builder()
-                          .InBrowserProcess(true)
-                          .UseMojoChannel(ShouldUseMojoChannel())
-                          .WithChannelName(channel_name)
-                          .Build()) {
+RenderThreadImpl::RenderThreadImpl(
+    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)
-    : ChildThreadImpl(Options::Builder()
-                          .InBrowserProcess(true)
-                          .UseMojoChannel(ShouldUseMojoChannel())
-                          .Build()),
+    scoped_ptr<base::MessageLoop> main_message_loop,
+    scoped_ptr<RendererScheduler> renderer_scheduler)
+    : ChildThreadImpl(
+          Options::Builder()
+              .InBrowserProcess(true)
+              .UseMojoChannel(ShouldUseMojoChannel())
+              .WithTaskRunner(renderer_scheduler->DefaultTaskRunner())
+              .Build()),
+      renderer_scheduler_(renderer_scheduler.Pass()),
       main_message_loop_(main_message_loop.Pass()) {
   Init();
 }
@@ -491,7 +504,6 @@ void RenderThreadImpl::Init() {
   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());