mustash: Enable connections to mus from the Chrome renderer [take 2]

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 "base/command_line.h"
 #include "base/lazy_instance.h"
+#include "base/stl_util.h"
 #include "base/threading/thread_local.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "mojo/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() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       "mojo-platform-channel-handle");
 }
 
 // static
 void MojoShellConnectionImpl::Create() {
-  DCHECK(IsRunningInMojoShell());
-  CreateWithMessagePipe(mojo::ScopedMessagePipeHandle());
+  DCHECK(!lazy_tls_ptr.Pointer()->Get());
+  MojoShellConnectionImpl* connection = new MojoShellConnectionImpl;
+  lazy_tls_ptr.Pointer()->Set(connection);
 }
 
 // static
-void MojoShellConnectionImpl::CreateWithMessagePipe(
+MojoShellConnectionImpl* MojoShellConnectionImpl::Get() {
+  return static_cast<MojoShellConnectionImpl*>(MojoShellConnection::Get());
+}
+
+void MojoShellConnectionImpl::BindToCommandLinePlatformChannel() {
+  DCHECK(IsRunningInMojoShell());
+  if (initialized_)
+    return;
+  WaitForShell(mojo::ScopedMessagePipeHandle());
+}
+
+void MojoShellConnectionImpl::BindToMessagePipe(
     mojo::ScopedMessagePipeHandle handle) {
-  DCHECK(!lazy_tls_ptr.Pointer()->Get());
-  MojoShellConnectionImpl* connection = new MojoShellConnectionImpl;
-  lazy_tls_ptr.Pointer()->Set(connection);
-  connection->WaitForShell(handle.Pass());
+  if (initialized_)
+    return;
+  WaitForShell(handle.Pass());
 }
 
 MojoShellConnectionImpl::MojoShellConnectionImpl() : initialized_(false) {}
-MojoShellConnectionImpl::~MojoShellConnectionImpl() {}
+MojoShellConnectionImpl::~MojoShellConnectionImpl() {
+  STLDeleteElements(&listeners_);
+}
 
 void MojoShellConnectionImpl::WaitForShell(
     mojo::ScopedMessagePipeHandle handle) {
   mojo::InterfaceRequest<mojo::Application> application_request;
   runner_connection_.reset(mojo::runner::RunnerConnection::ConnectToRunner(
       &application_request, handle.Pass()));
   application_impl_.reset(new mojo::ApplicationImpl(
       this, application_request.Pass()));
   application_impl_->WaitForInitialize();
 }
@@ skipping 35 matching lines @@
 // static
 void MojoShellConnection::Destroy() {
   // This joins the shell controller thread.
   delete Get();
   lazy_tls_ptr.Pointer()->Set(nullptr);
 }
 
 MojoShellConnection::~MojoShellConnection() {}
 
 }  // namespace content