mus/chrome: Always wait for the mojo shell.

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 <memory>
 #include <vector>
 
@@ skipping 21 matching lines @@
 
   // 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();
 
   // Binds the shell connection to a ShellClientFactory request pipe from the
   // command line. This must only be called once.
   void BindToRequestFromCommandLine();
 
+  // TODO(rockot): Remove this. http://crbug.com/594852.
+  shell::ShellConnection* shell_connection() { return shell_connection_.get(); }
+
  private:
   friend class MojoShellConnection;
 
   explicit MojoShellConnectionImpl(bool external);
   ~MojoShellConnectionImpl() override;
 
-  void WaitForShellIfNecessary();
-
   // shell::ShellClient:
   void Initialize(shell::Connector* connector,
                   const shell::Identity& identity,
                   uint32_t id) override;
   bool AcceptConnection(shell::Connection* connection) override;
 
   // MojoShellConnection:
   shell::Connector* GetConnector() override;
   const shell::Identity& GetIdentity() const override;
   bool UsingExternalShell() const override;
   void SetConnectionLostClosure(const base::Closure& closure) override;
   void AddListener(std::unique_ptr<Listener> listener) override;
   std::unique_ptr<Listener> RemoveListener(Listener* listener) override;
 
   const bool external_;
   std::unique_ptr<shell::ShellConnection> shell_connection_;
   std::vector<Listener*> listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoShellConnectionImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_