Bootstrap Mojo IPC independent of Chrome IPC

content/common/mojo/mojo_shell_connection_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/mojo/mojo_shell_connection_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_local.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/public/cpp/shell_connection.h"
 #include "mojo/shell/runner/child/runner_connection.h"
 
 namespace content {
 namespace {
+
 using MojoShellConnectionPtr =
     base::ThreadLocalPointer<MojoShellConnectionImpl>;
 
 // Env is thread local so that aura may be used on multiple threads.
 base::LazyInstance<MojoShellConnectionPtr>::Leaky lazy_tls_ptr =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 bool IsRunningInMojoShell() {
@@ skipping 29 matching lines @@
 
 MojoShellConnectionImpl::MojoShellConnectionImpl() : initialized_(false) {}
 MojoShellConnectionImpl::~MojoShellConnectionImpl() {
   STLDeleteElements(&listeners_);
 }
 
 void MojoShellConnectionImpl::WaitForShell(
     mojo::ScopedMessagePipeHandle handle) {
   mojo::ShellClientRequest request;
   runner_connection_.reset(mojo::shell::RunnerConnection::ConnectToRunner(
-      &request, std::move(handle)));
+      &request, std::move(handle), false /* exit_on_error */));
+  if (!runner_connection_) {
+    DLOG(ERROR) << "Unable to connect to the Mojo shell.";
+    delete this;
+    lazy_tls_ptr.Pointer()->Set(nullptr);
+    return;
+  }
   shell_connection_.reset(new mojo::ShellConnection(this, std::move(request)));
   shell_connection_->WaitForInitialize();
 }
 
 void MojoShellConnectionImpl::Initialize(mojo::Shell* shell,
                                          const std::string& url,
                                          uint32_t id) {
   initialized_ = true;
 }
 
@@ skipping 29 matching lines @@
 // static
 void MojoShellConnection::Destroy() {
   // This joins the shell controller thread.
   delete Get();
   lazy_tls_ptr.Pointer()->Set(nullptr);
 }
 
 MojoShellConnection::~MojoShellConnection() {}
 
 }  // namespace content