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

ui/views/mus/platform_test_helper_mus.cc

 // Copyright 2016 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 "ui/views/test/platform_test_helper.h"
 
 #include "base/command_line.h"
+#include "base/run_loop.h"
 #include "mojo/shell/background/background_shell.h"
 #include "mojo/shell/background/tests/test_catalog_store.h"
 #include "mojo/shell/public/cpp/connector.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/public/cpp/shell_connection.h"
 #include "ui/aura/env.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/views_delegate.h"
 
 using mojo::shell::BackgroundShell;
@@ skipping 24 matching lines @@
   PlatformTestHelperMus() {
     background_shell_.reset(new BackgroundShell);
     scoped_ptr<BackgroundShell::InitParams> init_params(
         new BackgroundShell::InitParams);
     init_params->catalog_store = BuildTestCatalogStore();
     background_shell_->Init(std::move(init_params));
     shell_client_.reset(new DefaultShellClient);
     shell_connection_.reset(new mojo::ShellConnection(
         shell_client_.get(),
         background_shell_->CreateShellClientRequest(kTestName)));
+
+    // TODO(rockot): Remove this RunLoop. http://crbug.com/594852.
+    base::RunLoop wait_loop;
+    shell_connection_->set_initialize_handler(wait_loop.QuitClosure());
+    wait_loop.Run();
+
     // ui/views/mus requires a WindowManager running, for now use the desktop
     // one.
     mojo::Connector* connector = shell_connection_->connector();
     connector->Connect("mojo:desktop_wm");
     WindowManagerConnection::Create(connector);
 
     // On X we need to reset the ContextFactory before every NativeWidgetMus
     // is created.
     // TODO(sad): this is a hack, figure out a better solution.
     ViewsDelegate::GetInstance()->set_native_widget_factory(base::Bind(
@@ skipping 31 matching lines @@
 };
 
 }  // namespace
 
 // static
 scoped_ptr<PlatformTestHelper> PlatformTestHelper::Create() {
   return make_scoped_ptr(new PlatformTestHelperMus);
 }
 
 }  // namespace views