Remove ShellConnection::WaitForInitialize

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

 // Copyright 2014 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 "base/bind.h"
 #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"
 #include "mojo/shell/public/cpp/lib/connector_impl.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/public/cpp/shell_connection.h"
 
 namespace mojo {
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShellConnection, public:
 
-ShellConnection::ShellConnection(
-    mojo::ShellClient* client,
-    InterfaceRequest<shell::mojom::ShellClient> request)
-    : client_(client),
-      binding_(this, std::move(request)),
-      weak_factory_(this) {}
+ShellConnection::ShellConnection(mojo::ShellClient* client)
+    : ShellConnection(client, nullptr) {}
+
+ShellConnection::ShellConnection(mojo::ShellClient* client,
+                                 shell::mojom::ShellClientRequest request)
+    : client_(client), binding_(this) {
+  shell::mojom::ConnectorPtr connector;
+  pending_connector_request_ = GetProxy(&connector);
+  connector_.reset(new ConnectorImpl(std::move(connector)));
+
+  if (request.is_pending())
+    BindToRequest(std::move(request));
+}
 
 ShellConnection::~ShellConnection() {}
 
-void ShellConnection::WaitForInitialize() {
-  DCHECK(!connector_);
-  binding_.WaitForIncomingMethodCall();
+void ShellConnection::BindToRequest(shell::mojom::ShellClientRequest request) {
+  DCHECK(!binding_.is_bound());
+  binding_.Bind(std::move(request));
+}
+
+void ShellConnection::SetAppTestConnectorForTesting(
+    shell::mojom::ConnectorPtr connector) {
+  pending_connector_request_ = nullptr;
+  connector_.reset(new ConnectorImpl(std::move(connector)));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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)));
-  binding_.set_connection_error_handler(
-      base::Bind(&ShellConnection::OnConnectionError,
-                 weak_factory_.GetWeakPtr()));
+void ShellConnection::Initialize(shell::mojom::IdentityPtr identity,
+                                 uint32_t id,
+                                 const InitializeCallback& callback) {
+  callback.Run(std::move(pending_connector_request_));
+
+  DCHECK(binding_.is_bound());
+  binding_.set_connection_error_handler([this] { OnConnectionError(); });
+
   client_->Initialize(connector_.get(), identity.To<Identity>(), id);
 }
 
 void ShellConnection::AcceptConnection(
     shell::mojom::IdentityPtr source,
     uint32_t source_id,
     shell::mojom::InterfaceProviderRequest local_interfaces,
     shell::mojom::InterfaceProviderPtr remote_interfaces,
     shell::mojom::CapabilityRequestPtr allowed_capabilities,
     const String& name) {
@@ skipping 16 matching lines @@
 void ShellConnection::OnConnectionError() {
   // Note that the ShellClient doesn't technically have to quit now, it may live
   // on to service existing connections. All existing Connectors however are
   // invalid.
   client_->ShellConnectionLost();
   // We don't reset the connector as clients may have taken a raw pointer to it.
   // Connect() will return nullptr if they try to connect to anything.
 }
 
 }  // namespace mojo