Changes to get mash browser_tests shutdown working correctly

content/public/test/test_launcher.cc

 // Copyright (c) 2012 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/public/test/test_launcher.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <set>
@@ skipping 454 matching lines @@
 const char kRunManualTestsFlag[] = "run-manual";
 
 const char kSingleProcessTestsFlag[]   = "single_process";
 
 scoped_ptr<TestState> TestLauncherDelegate::PreRunTest(
     base::CommandLine* command_line,
     base::TestLauncher::LaunchOptions* test_launch_options) {
   return nullptr;
 }
 
+void TestLauncherDelegate::OnDoneRunningTests() {}
+
 TestLauncherDelegate::~TestLauncherDelegate() {
 }
 
 int LaunchTests(TestLauncherDelegate* launcher_delegate,
                 int default_jobs,
                 int argc,
                 char** argv) {
   DCHECK(!g_launcher_delegate);
   g_launcher_delegate = launcher_delegate;
 
@@ skipping 49 matching lines @@
       "--single-process (to do the above, and also run Chrome in single-"
           "process mode).\n");
 
   base::MessageLoopForIO message_loop;
 
   // Allow the |launcher_delegate| to modify |default_jobs|.
   launcher_delegate->AdjustDefaultParallelJobs(&default_jobs);
 
   WrapperTestLauncherDelegate delegate(launcher_delegate);
   base::TestLauncher launcher(&delegate, default_jobs);
-  return (launcher.Run() ? 0 : 1);
+  const int result = launcher.Run() ? 0 : 1;
+  launcher_delegate->OnDoneRunningTests();
+  return result;
 }
 
 TestLauncherDelegate* GetCurrentTestLauncherDelegate() {
   return g_launcher_delegate;
 }
 
 ContentMainParams* GetContentMainParams() {
   return g_params;
 }
 
 }  // namespace content