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

content/common/mojo/mojo_shell_connection_impl.cc

 // Copyright 2015 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 "content/common/mojo/mojo_shell_connection_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
+#include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_local.h"
+#include "content/public/common/content_switches.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/public/cpp/shell_connection.h"
 #include "mojo/shell/runner/common/client_util.h"
 
 namespace content {
 namespace {
 
 using MojoShellConnectionPtr =
     base::ThreadLocalPointer<MojoShellConnectionImpl>;
 
 // Env is thread local so that aura may be used on multiple threads.
 base::LazyInstance<MojoShellConnectionPtr>::Leaky lazy_tls_ptr =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 bool IsRunningInMojoShell() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
-      "mojo-platform-channel-handle");
+      mojo::edk::PlatformChannelPair::kMojoPlatformChannelHandleSwitch);
+}
+
+bool ShouldWaitForShell() {
+  return IsRunningInMojoShell() &&
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kWaitForMojoShell);
 }
 
 // static
 void MojoShellConnectionImpl::Create() {
   DCHECK(!lazy_tls_ptr.Pointer()->Get());
   MojoShellConnectionImpl* connection =
       new MojoShellConnectionImpl(true /* external */);
   lazy_tls_ptr.Pointer()->Set(connection);
 }
 
@@ skipping 10 matching lines @@
 
 // static
 MojoShellConnectionImpl* MojoShellConnectionImpl::Get() {
   return static_cast<MojoShellConnectionImpl*>(MojoShellConnection::Get());
 }
 
 void MojoShellConnectionImpl::BindToRequestFromCommandLine() {
   DCHECK(!shell_connection_);
   shell_connection_.reset(new mojo::ShellConnection(
       this, mojo::shell::GetShellClientRequestFromCommandLine()));
+
+  // TODO(rockot): Remove this. http://crbug.com/594852.
+  if (ShouldWaitForShell()) {
+    base::RunLoop wait_loop;
+    shell_connection_->set_initialize_handler(wait_loop.QuitClosure());
+    wait_loop.Run();
+  }
 }
 
 MojoShellConnectionImpl::MojoShellConnectionImpl(bool external) :
     external_(external) {}
 
 MojoShellConnectionImpl::~MojoShellConnectionImpl() {
   STLDeleteElements(&listeners_);
 }
 
 void MojoShellConnectionImpl::Initialize(mojo::Connector* connector,
                                          const mojo::Identity& identity,
                                          uint32_t id) {
 }
 
 bool MojoShellConnectionImpl::AcceptConnection(mojo::Connection* connection) {
   bool found = false;
   for (auto listener : listeners_)
     found |= listener->AcceptConnection(connection);
   return found;
 }
 
+void MojoShellConnectionImpl::ShellConnectionLost() {
+  LOG(ERROR) << "Shell connection lost.";
+}
+
 mojo::Connector* MojoShellConnectionImpl::GetConnector() {
   DCHECK(shell_connection_);
   return shell_connection_->connector();
 }
 
 bool MojoShellConnectionImpl::UsingExternalShell() const {
   return external_;
 }
 
 void MojoShellConnectionImpl::AddListener(Listener* listener) {
@@ skipping 16 matching lines @@
 // static
 void MojoShellConnection::Destroy() {
   // This joins the shell controller thread.
   delete Get();
   lazy_tls_ptr.Pointer()->Set(nullptr);
 }
 
 MojoShellConnection::~MojoShellConnection() {}
 
 }  // namespace content