Fix --use-mus-in-renderer for mus+ash

content/renderer/render_thread_impl.cc

Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 660b52bedbb249e4e9c8877f6dd009aa38083e2b..0ca11970bf6422921335b358ec0ea8bed7144d77 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -852,7 +852,7 @@ void RenderThreadImpl::Init(
 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
   // We may not have a MojoShellConnection object in tests that directly
   // instantiate a RenderThreadImpl.
-  if (MojoShellConnection::GetForProcess() &&
+  if (ChildThread::Get()->GetMojoShellConnection() &&
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUseMusInRenderer))
     CreateRenderWidgetWindowTreeClientFactory();
@@ -1837,8 +1837,7 @@ RenderThreadImpl::CreateCompositorOutputSurface(
     use_software = true;
 
 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
-  auto* shell_connection = MojoShellConnection::GetForProcess();
-  if (shell_connection && !use_software &&
+  if (ChildThread::Get()->GetMojoShellConnection() && !use_software &&
       command_line.HasSwitch(switches::kUseMusInRenderer)) {
     RenderWidgetMusConnection* connection =
         RenderWidgetMusConnection::GetOrCreate(routing_id);