content: Add an overridable task runner to ChildThreadImpl

content/child/child_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/child/child_thread_impl.h"
 
 #include <signal.h>
 
 #include <string>
 
@@ skipping 227 matching lines @@
 
 void ChildThreadImpl::SingleProcessChannelDelegateDeleter::operator()(
     SingleProcessChannelDelegate* delegate) const {
   delegate->DeleteSoon();
 }
 
 ChildThreadImpl::Options::Options()
     : channel_name(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kProcessChannelID)),
       use_mojo_channel(false),
-      in_browser_process(false) {
+      in_browser_process(false),
+      task_runner(base::MessageLoopProxy::current()) {
 }
 
 ChildThreadImpl::Options::~Options() {
 }
 
 ChildThreadImpl::Options::Builder::Builder() {
 }
 
 ChildThreadImpl::Options::Builder&
 ChildThreadImpl::Options::Builder::InBrowserProcess(bool in_browser_process) {
@@ skipping 14 matching lines @@
   return *this;
 }
 
 ChildThreadImpl::Options::Builder&
 ChildThreadImpl::Options::Builder::AddStartupFilter(
     IPC::MessageFilter* filter) {
   options_.startup_filters.push_back(filter);
   return *this;
 }
 
+ChildThreadImpl::Options::Builder&
+ChildThreadImpl::Options::Builder::WithTaskRunner(
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
+  options_.task_runner = task_runner;
+  return *this;
+}
+
 ChildThreadImpl::Options ChildThreadImpl::Options::Builder::Build() {
   return options_;
 }
 
 ChildThreadImpl::ChildThreadMessageRouter::ChildThreadMessageRouter(
     IPC::Sender* sender)
     : sender_(sender) {}
 
 bool ChildThreadImpl::ChildThreadMessageRouter::Send(IPC::Message* msg) {
   return sender_->Send(msg);
 }
 
 ChildThreadImpl::ChildThreadImpl()
-    : router_(this),
-      in_browser_process_(false),
-      channel_connected_factory_(this) {
-  Init(Options::Builder().Build());
+    : ChildThreadImpl(Options::Builder().Build()) {

[Sami, 2015/03/06 17:01:34]

So turns out this was triggering an MSVC compiler code generation bug[1] which
caused the win8 trybot failures. I've reverted back to the non-delegated
constructor we had here before. I'll send a notice to blink-dev too.

[1] https://connect.microsoft.com/VisualStudio/feedbackdetail/view/841488

 }
 
 ChildThreadImpl::ChildThreadImpl(const Options& options)
     : router_(this),
+      task_runner_(options.task_runner),
       in_browser_process_(options.in_browser_process),
       channel_connected_factory_(this) {
   Init(options);
 }
 
 void ChildThreadImpl::ConnectChannel(bool use_mojo_channel) {
   bool create_pipe_now = true;
   if (use_mojo_channel) {
     VLOG(1) << "Mojo is enabled on child";
     scoped_refptr<base::TaskRunner> io_task_runner =
@@ skipping 37 matching lines @@
     IPC::Logging::GetInstance()->SetIPCSender(this);
 #endif
 
   mojo_application_.reset(new MojoApplication);
 
   sync_message_filter_ =
       new IPC::SyncMessageFilter(ChildProcess::current()->GetShutDownEvent());
   thread_safe_sender_ = new ThreadSafeSender(
       base::MessageLoopProxy::current().get(), sync_message_filter_.get());
 
-  resource_dispatcher_.reset(new ResourceDispatcher(
-      this, message_loop()->task_runner()));
+  resource_dispatcher_.reset(new ResourceDispatcher(this, GetTaskRunner()));
   websocket_dispatcher_.reset(new WebSocketDispatcher);
   file_system_dispatcher_.reset(new FileSystemDispatcher());
 
   histogram_message_filter_ = new ChildHistogramMessageFilter();
   resource_message_filter_ =
       new ChildResourceMessageFilter(resource_dispatcher());
 
   service_worker_message_filter_ =
       new ServiceWorkerMessageFilter(thread_safe_sender_.get());
 
@@ skipping 144 matching lines @@
 bool ChildThreadImpl::Send(IPC::Message* msg) {
   DCHECK(base::MessageLoop::current() == message_loop());
   if (!channel_) {
     delete msg;
     return false;
   }
 
   return channel_->Send(msg);
 }
 
+scoped_refptr<base::SingleThreadTaskRunner> ChildThreadImpl::GetTaskRunner() {
+  return task_runner_;
+}
+
 #if defined(OS_WIN)
 void ChildThreadImpl::PreCacheFont(const LOGFONT& log_font) {
   Send(new ChildProcessHostMsg_PreCacheFont(log_font));
 }
 
 void ChildThreadImpl::ReleaseCachedFonts() {
   Send(new ChildProcessHostMsg_ReleaseCachedFonts());
 }
 #endif
 
@@ skipping 198 matching lines @@
   // doesn't cause such issues. TODO(gab): Remove this once the experiment is
   // over (http://crbug.com/458594).
   base::FieldTrial* trial =
       base::FieldTrialList::Find("BackgroundRendererProcesses");
   if (trial && trial->group_name() == "AllowBackgroundModeFromRenderer")
     base::Process::Current().SetProcessBackgrounded(background);
 #endif  // OS_WIN
 }
 
 }  // namespace content