Index: content/test/render_thread_impl_browser_test_ipc_helper.cc |
diff --git a/content/test/render_thread_impl_browser_test_ipc_helper.cc b/content/test/render_thread_impl_browser_test_ipc_helper.cc |
index 59d09c240fb33da6f6d07c0f608adf1e2b0f38aa..3075f753225d4e343b457dcfeb98b8a0cb1aea42 100644 |
--- a/content/test/render_thread_impl_browser_test_ipc_helper.cc |
+++ b/content/test/render_thread_impl_browser_test_ipc_helper.cc |
@@ -4,6 +4,7 @@ |
#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" |
@@ -40,13 +41,17 @@ void RenderThreadImplBrowserIPCTestHelper::SetupIpcThread() { |
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(), |