Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(265)

Unified Diff: content/test/render_thread_impl_browser_test_ipc_helper.cc

Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use run_renderer_in_process() Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/render_thread_impl_browser_test_ipc_helper.h ('k') | crypto/crypto.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(),
« no previous file with comments | « content/test/render_thread_impl_browser_test_ipc_helper.h ('k') | crypto/crypto.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698