Reinstate wait-for-Initialize when Chrome is run in Mash

mojo/shell/public/cpp/shell_connection.h

 // 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.
 
 #ifndef MOJO_SHELL_PUBLIC_CPP_SHELL_CONNECTION_H_
 #define MOJO_SHELL_PUBLIC_CPP_SHELL_CONNECTION_H_
 
 #include <utility>
 #include <vector>
 
+#include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/public/interfaces/connector.mojom.h"
 #include "mojo/shell/public/interfaces/shell_client.mojom.h"
 
 namespace mojo {
@@ skipping 26 matching lines @@
   // used immediately to make outgoing connections via connector().  Does not
   // take ownership of |client|, which must remain valid for the lifetime of
   // ShellConnection.
   ShellConnection(mojo::ShellClient* client,
                   shell::mojom::ShellClientRequest request);
 
   ~ShellConnection() override;
 
   Connector* connector() { return connector_.get(); }
 
+  // TODO(rockot): Remove this. http://crbug.com/594852.
+  void set_initialize_handler(const base::Closure& callback);
+
   // TODO(rockot): Remove this once we get rid of app tests.
   void SetAppTestConnectorForTesting(shell::mojom::ConnectorPtr connector);
 
  private:
   // shell::mojom::ShellClient:
   void Initialize(shell::mojom::IdentityPtr identity,
                   uint32_t id,
                   const InitializeCallback& callback) override;
   void AcceptConnection(
       shell::mojom::IdentityPtr source,
       uint32_t source_id,
       shell::mojom::InterfaceProviderRequest remote_interfaces,
       shell::mojom::InterfaceProviderPtr local_interfaces,
       shell::mojom::CapabilityRequestPtr allowed_capabilities,
       const String& name) override;
 
   void OnConnectionError();
 
+  // A callback called when Initialize() is run.
+  base::Closure initialize_handler_;
+
   // We track the lifetime of incoming connection registries as it more
   // convenient for the client.
   ScopedVector<Connection> incoming_connections_;
 
   // A pending Connector request which will eventually be passed to the shell.
   shell::mojom::ConnectorRequest pending_connector_request_;
 
   mojo::ShellClient* client_;
   Binding<shell::mojom::ShellClient> binding_;
   scoped_ptr<Connector> connector_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellConnection);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_PUBLIC_CPP_SHELL_CONNECTION_H_