Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819

content/child/mojo/mojo_application.cc

 // Copyright 2014 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/mojo/mojo_application.h"
 
 #include "content/child/child_process.h"
 #include "content/common/application_setup.mojom.h"
+#include "content/common/mojo/channel_init.h"
 #include "content/common/mojo/mojo_messages.h"
 #include "ipc/ipc_message.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h"
 
 namespace content {
 
 MojoApplication::MojoApplication() {
 }
 
 MojoApplication::~MojoApplication() {
 }
 
 bool MojoApplication::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(MojoApplication, msg)
     IPC_MESSAGE_HANDLER(MojoMsg_Activate, OnActivate)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void MojoApplication::OnActivate(
     const IPC::PlatformFileForTransit& file) {
 #if defined(OS_POSIX)
   base::PlatformFile handle = file.fd;
 #elif defined(OS_WIN)
   base::PlatformFile handle = file;
 #endif
+  scoped_refptr<base::TaskRunner> io_task_runner =
+      ChannelInit::GetSingleProcessIOTaskRunner();
+  if (!io_task_runner) {
+    io_task_runner = ChildProcess::current()->io_message_loop_proxy();
+  }
+  DCHECK(io_task_runner);
+
   mojo::ScopedMessagePipeHandle message_pipe =
-      channel_init_.Init(handle,
-                         ChildProcess::current()->io_message_loop_proxy());
+      channel_init_.Init(handle, io_task_runner);
   DCHECK(message_pipe.is_valid());
 
   ApplicationSetupPtr application_setup;
   application_setup.Bind(message_pipe.Pass());
 
   mojo::ServiceProviderPtr services;
   mojo::ServiceProviderPtr exposed_services;
   service_registry_.Bind(GetProxy(&exposed_services));
   application_setup->ExchangeServiceProviders(GetProxy(&services),
                                               exposed_services.Pass());
   service_registry_.BindRemoteServiceProvider(services.Pass());
 }
 
 }  // namespace content