Remove ShellConnection::WaitForInitialize

content/common/mojo/mojo_shell_connection_impl.h

Index: content/common/mojo/mojo_shell_connection_impl.h
diff --git a/content/common/mojo/mojo_shell_connection_impl.h b/content/common/mojo/mojo_shell_connection_impl.h
index 5f5336349e3d1893436721640ad6913fcf113d10..f11a22ac4b4a31c376f088e6b170c02e521d9657 100644
--- a/content/common/mojo/mojo_shell_connection_impl.h
+++ b/content/common/mojo/mojo_shell_connection_impl.h
@@ -42,21 +42,18 @@ class MojoShellConnectionImpl : public MojoShellConnection,
   // 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);
+  // Connects to the shell over a given ShellClientFactory request. If |request|
+  // is null, this attempts to extract a request pipe from the command line.
+  // This must only be called once.
+  void Connect(mojo::shell::mojom::ShellClientFactoryRequest request);

[Ben Goodger (Google), 2016/03/13 04:16:24]

I think this name is confusing. Generally we use the "connect" verb to imply
establishing a connection to a remote service, which is not an idempotent
action.

[Ken Rockot(use gerrit already), 2016/03/13 16:14:25]

I've changed it to BindToRequestFromCommandLine for now. I think we can get rid
of this soon and roll the behavior into Create(), it would just require changing
more than I'd like to change for this patch.

 
  private:
   explicit MojoShellConnectionImpl(bool external);
   ~MojoShellConnectionImpl() override;
 
   // mojo::ShellClient:
-  void Initialize(mojo::Connector* connector, const mojo::Identity& identity,
+  void Initialize(mojo::Connector* connector,
+                  const mojo::Identity& identity,
                   uint32_t id) override;
   bool AcceptConnection(mojo::Connection* connection) override;
 
@@ -66,15 +63,9 @@ class MojoShellConnectionImpl : public MojoShellConnection,
   void AddListener(Listener* listener) override;
   void RemoveListener(Listener* listener) override;
 
-  // Blocks the calling thread until a connection to the spawning shell is
-  // established, an Application request from it is bound, and the Initialize()
-  // method on that application is called.
-  void WaitForShell(mojo::ScopedMessagePipeHandle handle);
-
   bool external_;
-  bool initialized_;
-  scoped_ptr<mojo::shell::RunnerConnection> runner_connection_;
   scoped_ptr<mojo::ShellConnection> shell_connection_;
+  scoped_ptr<mojo::shell::RunnerConnection> runner_connection_;
   std::vector<Listener*> listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoShellConnectionImpl);