mus::GpuService: Support establish GpuChannel asynchronously.

content/browser/renderer_host/render_process_host_impl.cc

Index: content/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index d068474919cc52c084ff3302f5df35821f7f319f..f0847315dc114fb62e2a851542421e64bb8cef66 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -233,7 +233,7 @@
 #include "content/common/media/media_stream_messages.h"
 #endif
 
-#if defined(MOJO_RUNNER_CLIENT)
+#if defined(MOJO_SHELL_CLIENT)
 #include "components/mus/common/switches.h"
 #endif
 
@@ -1535,14 +1535,12 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
 #if defined(OS_CHROMEOS)
     switches::kDisableVaapiAcceleratedVideoEncode,
 #endif
-#if defined(MOJO_SHELL_CLIENT)
-    switches::kUseMusInRenderer,
-#endif
 #if defined(ENABLE_IPC_FUZZER)
     switches::kIpcDumpDirectory,
     switches::kIpcFuzzerTestcase,
 #endif
-#if defined(MOJO_RUNNER_CLIENT)
+#if defined(MOJO_SHELL_CLIENT)
+    switches::kUseMusInRenderer,
     mus::switches::kUseChromeGpuCommandBufferInMus,
 #endif
   };