| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index 2977bc0e0a12aaf28ccf7d62a0a3a64566fae14f..bb7fee61414f03142640573c3b07faf8a0121217 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -82,6 +82,7 @@
|
| #include "content/public/common/content_constants.h"
|
| #include "content/public/common/content_paths.h"
|
| #include "content/public/common/content_switches.h"
|
| +#include "content/public/common/mojo_channel_switches.h"
|
| #include "content/public/common/renderer_preferences.h"
|
| #include "content/public/common/url_constants.h"
|
| #include "content/public/renderer/content_renderer_client.h"
|
| @@ -572,7 +573,9 @@
|
| std::unique_ptr<scheduler::RendererScheduler> scheduler,
|
| scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue)
|
| : ChildThreadImpl(Options::Builder()
|
| - .InBrowserProcess(params).UseMojoChannel(true).Build()),
|
| + .InBrowserProcess(params)
|
| + .UseMojoChannel(ShouldUseMojoChannel())
|
| + .Build()),
|
| renderer_scheduler_(std::move(scheduler)),
|
| raster_worker_pool_(new RasterWorkerPool()) {
|
| Init(resource_task_queue);
|
| @@ -583,7 +586,8 @@
|
| RenderThreadImpl::RenderThreadImpl(
|
| std::unique_ptr<base::MessageLoop> main_message_loop,
|
| std::unique_ptr<scheduler::RendererScheduler> scheduler)
|
| - : ChildThreadImpl(Options::Builder().UseMojoChannel(true).Build()),
|
| + : ChildThreadImpl(
|
| + Options::Builder().UseMojoChannel(ShouldUseMojoChannel()).Build()),
|
| renderer_scheduler_(std::move(scheduler)),
|
| main_message_loop_(std::move(main_message_loop)),
|
| raster_worker_pool_(new RasterWorkerPool()) {
|
|
|