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 90f08284b19dacb1fdce4bd12531386e145c6448..33fff3305921282a37bfd598ebc8c4cb6721f5a8 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -232,8 +232,8 @@
 #include "content/common/media/media_stream_messages.h"
 #endif
 
-#if defined(MOJO_RUNNER_CLIENT)
-#include "components/mus/common/switches.h"
+#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
+#include "components/mus/common/switches.h"  // nogncheck
 #endif
 
 #if defined(OS_WIN)
@@ -1547,14 +1547,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) && defined(USE_AURA)
+    switches::kUseMusInRenderer,
     mus::switches::kUseMojoGpuCommandBufferInMus,
 #endif
   };