| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index 928702d6feff8ec8ef88d09be43789374212d063..9cb97a93dc9ad31f2c4019a1d457c49eb1862eed 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -852,7 +852,9 @@ void RenderThreadImpl::Init() {
|
| #if defined(MOJO_SHELL_CLIENT)
|
| // We may not have a MojoShellConnection object in tests that directly
|
| // instantiate a RenderThreadImpl.
|
| - if (MojoShellConnection::Get())
|
| + if (MojoShellConnection::Get() &&
|
| + base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kUseMusInRenderer))
|
| CreateRenderWidgetWindowTreeClientFactory();
|
| #endif
|
|
|
|
|