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

content/common/mojo/mojo_shell_connection_impl.h

 // 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.
 
 #ifndef CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_
 #define CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_
 
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 10 matching lines @@
 
 namespace content {
 
 // Returns true for processes launched from an external mojo shell.
 bool IsRunningInMojoShell();
 
 class MojoShellConnectionImpl : public MojoShellConnection,
                                 public mojo::ApplicationDelegate {
  public:
   // Creates an instance of this class and stuffs it in TLS on the calling
-  // thread. Retrieve it using MojoShellConnection::Get(). Blocks the calling
-  // thread until calling GetApplication() will return an Initialized()
-  // application with a bound ShellPtr.
+  // thread. Retrieve it using MojoShellConnection::Get().
   static void Create();
-  // Same as Create(), but receives a handle instead of looking for one on the
-  // command line.
-  static void CreateWithMessagePipe(mojo::ScopedMessagePipeHandle handle);
+
+  // Will return null if no connection has been established (either because it
+  // hasn't happened yet or the application was not spawned from the external
+  // Mojo shell).
+  static MojoShellConnectionImpl* Get();
+
+  // Blocks the calling thread until calling GetApplication() will return an
+  // Initialized() application with a bound ShellPtr. This call is a no-op
+  // if the connection has already been initialized.
+  void BindToCommandLinePlatformChannel();
+
+  // Same as BindToCommandLinePlatformChannel(), but receives a |handle| instead
+  // of looking for one on the command line.
+  void BindToMessagePipe(mojo::ScopedMessagePipeHandle handle);
 
  private:
   MojoShellConnectionImpl();
   ~MojoShellConnectionImpl() override;
 
   // mojo::ApplicationDelegate:
   void Initialize(mojo::ApplicationImpl* application) override;
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override;
 
@@ skipping 11 matching lines @@
   scoped_ptr<mojo::runner::RunnerConnection> runner_connection_;
   scoped_ptr<mojo::ApplicationImpl> application_impl_;
   std::vector<Listener*> listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoShellConnectionImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_