Hook embedded shell up to MojoShellConnection

content/child/child_thread_impl.cc

Index: content/child/child_thread_impl.cc
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
index bdc346dd8557a6a7027016fe037eb8e8dace6c53..467b474ba359aa859e747d2ea676f7a4fc0c6612 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -53,6 +53,7 @@
 #include "content/common/child_process_messages.h"
 #include "content/common/in_process_child_thread_params.h"
 #include "content/common/mojo/mojo_messages.h"
+#include "content/common/mojo/mojo_shell_connection_impl.h"
 #include "content/public/common/content_switches.h"
 #include "ipc/attachment_broker.h"
 #include "ipc/attachment_broker_unprivileged.h"
@@ -68,10 +69,6 @@
 #include "ui/ozone/public/client_native_pixmap_factory.h"
 #endif
 
-#if defined(MOJO_SHELL_CLIENT)
-#include "content/common/mojo/mojo_shell_connection_impl.h"
-#endif
-
 using tracked_objects::ThreadData;
 
 namespace content {
@@ -672,7 +669,8 @@ void ChildThreadImpl::OnProfilingPhaseCompleted(int profiling_phase) {
 
 void ChildThreadImpl::OnBindExternalMojoShellHandle(
     const IPC::PlatformFileForTransit& file) {
-#if defined(MOJO_SHELL_CLIENT)
+  if (!MojoShellConnectionImpl::Get())
+    return;
 #if defined(OS_POSIX)
   base::PlatformFile handle = file.fd;
 #elif defined(OS_WIN)
@@ -681,7 +679,6 @@ void ChildThreadImpl::OnBindExternalMojoShellHandle(
   mojo::ScopedMessagePipeHandle pipe =
       mojo_shell_channel_init_.Init(handle, GetIOTaskRunner());
   MojoShellConnectionImpl::Get()->BindToMessagePipe(std::move(pipe));
-#endif  // defined(MOJO_SHELL_CLIENT)
 }
 
 void ChildThreadImpl::OnSetMojoParentPipeHandle(