Kill ShellConnection::WaitForInitialize

mojo/shell/public/cpp/lib/shell_connection.cc

Index: mojo/shell/public/cpp/lib/shell_connection.cc
diff --git a/mojo/shell/public/cpp/lib/shell_connection.cc b/mojo/shell/public/cpp/lib/shell_connection.cc
index 2e2a7ec9b4f2170134506bc5bc446454aefaab72..214a822c9601d290da1db132ad1a66cd2ba584aa 100644
--- a/mojo/shell/public/cpp/lib/shell_connection.cc
+++ b/mojo/shell/public/cpp/lib/shell_connection.cc
@@ -6,6 +6,7 @@
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/shell/public/cpp/capabilities.h"
 #include "mojo/shell/public/cpp/connector.h"
 #include "mojo/shell/public/cpp/lib/connection_impl.h"
@@ -23,22 +24,24 @@ ShellConnection::ShellConnection(
     InterfaceRequest<shell::mojom::ShellClient> request)
     : client_(client),
       binding_(this, std::move(request)),
-      weak_factory_(this) {}
+      weak_factory_(this) {
+  shell::mojom::ConnectorPtr connector;
+  pending_connector_request_ = GetProxy(&connector);
+  connector_.reset(new ConnectorImpl(std::move(connector)));
+}
 
 ShellConnection::~ShellConnection() {}
 
-void ShellConnection::WaitForInitialize() {
-  DCHECK(!connector_);
-  binding_.WaitForIncomingMethodCall();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // ShellConnection, shell::mojom::ShellClient implementation:
 
 void ShellConnection::Initialize(shell::mojom::ConnectorPtr connector,
                                  shell::mojom::IdentityPtr identity,
                                  uint32_t id) {
-  connector_.reset(new ConnectorImpl(std::move(connector)));
+  CHECK(pending_connector_request_.is_pending());
+  CHECK(FuseInterface(std::move(pending_connector_request_),
+                      connector.PassInterface()));
+
   binding_.set_connection_error_handler(
       base::Bind(&ShellConnection::OnConnectionError,
                  weak_factory_.GetWeakPtr()));