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

Unified Diff: content/test/render_thread_impl_browser_test_ipc_helper.cc

Issue 873913002: Revert of Disable Mojo on RenderThreadImplBrowserTest on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | « no previous file | no next file » | 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 f3e536d959c02bb80761647c9aa37e6b56d21ea8..59d09c240fb33da6f6d07c0f608adf1e2b0f38aa 100644
--- a/content/test/render_thread_impl_browser_test_ipc_helper.cc
+++ b/content/test/render_thread_impl_browser_test_ipc_helper.cc
@@ -23,18 +23,7 @@
SetupIpcThread();
- // TODO(crbug.com/451221): Mojo should be used here even for Android.
- // Currently SetupMojo() calls InitializeMojo() which can be called at most
- // once for each process. This implices that every test case using
- // RenderThreadImplBrowserIPCTestHelper has to run in a dedicated process, but
- // that is false on OS_ANDROID. There is no way to call InitializeMojo() only
- // if it isn't initialized yet.
-#if defined(OS_ANDROID)
- bool use_mojo_channel = false;
-#else
- bool use_mojo_channel = IPC::ChannelMojo::ShouldBeUsed();
-#endif
- if (use_mojo_channel) {
+ if (IPC::ChannelMojo::ShouldBeUsed()) {
SetupMojo();
} else {
channel_ = IPC::ChannelProxy::Create(channel_id_, IPC::Channel::MODE_SERVER,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698