Changes to get mash browser_tests shutdown working correctly

chrome/test/base/mojo_test_connector.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 "chrome/test/base/mojo_test_connector.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/test_launcher.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/process_delegate.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/services/catalog/store.h"
 #include "mojo/shell/background/tests/test_catalog_store.h"
+#include "mojo/shell/native_runner_delegate.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 "mojo/shell/runner/common/client_util.h"
 #include "mojo/shell/runner/common/switches.h"
 #include "mojo/shell/shell.h"
 #include "mojo/shell/switches.h"
 
 using mojo::shell::mojom::ShellClient;
 using mojo::shell::mojom::ShellClientPtr;
@@ skipping 177 matching lines @@
   }
 
   mojo::shell::BackgroundShell* background_shell_;
   scoped_ptr<BackgroundTestState> background_state_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoTestState);
 };
 
 }  // namespace
 
+class MojoTestConnector::NativeRunnerDelegateImpl
+    : public mojo::shell::NativeRunnerDelegate {
+ public:
+  NativeRunnerDelegateImpl() {}
+  ~NativeRunnerDelegateImpl() override {}
+
+ private:
+  // mojo::shell::NativeRunnerDelegate:
+  void AdjustCommandLineArgumentsForTarget(
+      const mojo::Identity& target,
+      base::CommandLine* command_line) override {
+    if (target.name() == "exe:chrome")
+      command_line->AppendSwitch(switches::kWaitForMojoShell);
+  }
+
+  DISALLOW_COPY_AND_ASSIGN(NativeRunnerDelegateImpl);
+};
+
 // static
 const char MojoTestConnector::kTestSwitch[] = "is_test";
 
 MojoTestConnector::MojoTestConnector() {}
 
 mojo::shell::mojom::ShellClientRequest MojoTestConnector::Init() {
+  native_runner_delegate_.reset(new NativeRunnerDelegateImpl);
   scoped_ptr<mojo::shell::BackgroundShell::InitParams> init_params(
       new mojo::shell::BackgroundShell::InitParams);
   init_params->catalog_store = BuildTestCatalogStore();
   // When running in single_process mode chrome initializes the edk.
   init_params->init_edk = !base::CommandLine::ForCurrentProcess()->HasSwitch(
       content::kSingleProcessTestsFlag);
+  init_params->native_runner_delegate = native_runner_delegate_.get();
   background_shell_.Init(std::move(init_params));
   return background_shell_.CreateShellClientRequest(kTestRunnerName);
 }
 
 MojoTestConnector::~MojoTestConnector() {}
 
 scoped_ptr<content::TestState> MojoTestConnector::PrepareForTest(
     base::CommandLine* command_line,
     base::TestLauncher::LaunchOptions* test_launch_options) {
   scoped_ptr<MojoTestState> test_state(new MojoTestState(&background_shell_));
   test_state->Init(command_line, test_launch_options);
   return std::move(test_state);
 }