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

mojo/shell/public/cpp/shell_connection.h

Index: mojo/shell/public/cpp/shell_connection.h
diff --git a/mojo/shell/public/cpp/shell_connection.h b/mojo/shell/public/cpp/shell_connection.h
index 8c90ec7d016676f91579fcb2d34b89a0cb9cd333..a05f6f136676a5ba022a190215be3b117c22fdc7 100644
--- a/mojo/shell/public/cpp/shell_connection.h
+++ b/mojo/shell/public/cpp/shell_connection.h
@@ -8,6 +8,7 @@
 #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"
@@ -54,6 +55,9 @@ class ShellConnection : public shell::mojom::ShellClient {
 
   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);
 
@@ -72,6 +76,9 @@ class ShellConnection : public shell::mojom::ShellClient {
 
   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_;