Index: content/renderer/render_thread_impl.cc |
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
index 6c4e7af10689e90feba5c56b03efec481a2609af..de0a28798ac23f494937542badb86c80f33c6710 100644 |
--- a/content/renderer/render_thread_impl.cc |
+++ b/content/renderer/render_thread_impl.cc |
@@ -291,6 +291,11 @@ void CreateRenderFrameSetup(mojo::InterfaceRequest<RenderFrameSetup> request) { |
mojo::BindToRequest(new RenderFrameSetupImpl(), &request); |
} |
+bool IsMojoChannelEnabled() { |
+ return CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kEnableRendererMojoChannel); |
+} |
+ |
} // namespace |
// For measuring memory usage after each task. Behind a command line flag. |
@@ -359,12 +364,13 @@ RenderThreadImpl* RenderThreadImpl::current() { |
// When we run plugins in process, we actually run them on the render thread, |
// which means that we need to make the render thread pump UI events. |
-RenderThreadImpl::RenderThreadImpl() { |
+RenderThreadImpl::RenderThreadImpl() |
+ : ChildThread(InitOptions("", IsMojoChannelEnabled())) { |
Init(); |
} |
RenderThreadImpl::RenderThreadImpl(const std::string& channel_name) |
- : ChildThread(channel_name) { |
+ : ChildThread(InitOptions(channel_name, IsMojoChannelEnabled())) { |
Init(); |
} |