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

Unified Diff: content/test/render_thread_impl_browser_test_ipc_helper.cc

Issue 1946573002: Revert of Turn on MojoChannel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/renderer/render_thread_impl.cc ('k') | tools/ipc_fuzzer/message_replay/replay_process.cc » ('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 52cb151042f57073b3fc1cc8f3cd4a050207f14f..11f08516bb27efc80448f70512a4c7ec0d73cf0f 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/public/common/mojo_channel_switches.h"
#include "mojo/edk/embedder/embedder.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -22,7 +23,14 @@
dummy_listener_.reset(new DummyListener());
SetupIpcThread();
- SetupMojo();
+
+ if (ShouldUseMojoChannel()) {
+ SetupMojo();
+ } else {
+ channel_ = IPC::ChannelProxy::Create(channel_id_, IPC::Channel::MODE_SERVER,
+ dummy_listener_.get(),
+ ipc_thread_->task_runner());
+ }
}
RenderThreadImplBrowserIPCTestHelper::~RenderThreadImplBrowserIPCTestHelper() {
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | tools/ipc_fuzzer/message_replay/replay_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698