Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819

content/test/render_thread_impl_browser_test_ipc_helper.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/test/render_thread_impl_browser_test_ipc_helper.h"
 
+#include "content/common/mojo/channel_init.h"
 #include "ipc/mojo/ipc_channel_mojo_host.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 class RenderThreadImplBrowserIPCTestHelper::DummyListener
     : public IPC::Listener {
  public:
   bool OnMessageReceived(const IPC::Message& message) override { return true; }
 };
@@ skipping 16 matching lines @@
 }
 
 RenderThreadImplBrowserIPCTestHelper::~RenderThreadImplBrowserIPCTestHelper() {
 }
 
 void RenderThreadImplBrowserIPCTestHelper::SetupIpcThread() {
   ipc_thread_.reset(new base::Thread("test_ipc_thread"));
   base::Thread::Options options;
   options.message_loop_type = base::MessageLoop::TYPE_IO;
   ASSERT_TRUE(ipc_thread_->StartWithOptions(options));
+  ChannelInit::SetSingleProcessIOTaskRunner(ipc_thread_->task_runner());
 }
 
 void RenderThreadImplBrowserIPCTestHelper::SetupMojo() {
   InitializeMojo();
 
+  ipc_support_.reset(new IPC::ScopedIPCSupport(ipc_thread_->task_runner()));
   mojo_host_.reset(new IPC::ChannelMojoHost(ipc_thread_->task_runner()));
   mojo_application_host_.reset(new MojoApplicationHost());
+  mojo_application_host_->OverrideIOTaskRunnerForTest(
+      ipc_thread_->task_runner());
 
   channel_ = IPC::ChannelProxy::Create(
       IPC::ChannelMojo::CreateServerFactory(mojo_host_->channel_delegate(),
                                             channel_id_),
       dummy_listener_.get(), ipc_thread_->task_runner());
 
   mojo_application_host_->Init();
   mojo_application_host_->Activate(channel_.get(),
                                    base::GetCurrentProcessHandle());
   mojo_host_->OnClientLaunched(base::GetCurrentProcessHandle());
 }
 
 }  // namespace content