Changes to get mash browser_tests shutdown working correctly

content/public/test/test_launcher.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_PUBLIC_TEST_TEST_LAUNCHER_H_
 #define CONTENT_PUBLIC_TEST_TEST_LAUNCHER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 32 matching lines @@
 class TestLauncherDelegate {
  public:
   virtual int RunTestSuite(int argc, char** argv) = 0;
   virtual bool AdjustChildProcessCommandLine(
       base::CommandLine* command_line,
       const base::FilePath& temp_data_dir) = 0;
   virtual void PreRunMessageLoop(base::RunLoop* run_loop) {}
   virtual void PostRunMessageLoop() {}
   virtual ContentMainDelegate* CreateContentMainDelegate() = 0;
 
+  // Called prior to returning from LaunchTests(). Gives the delegate a chance
+  // to do cleanup before state created by TestLauncher has been destroyed (such
+  // as the AtExitManager).
+  virtual void OnDoneRunningTests();

[jam, 2016/03/23 15:12:16]

nit: move this to the end (after line 70) so that the function order matches the
order they're called in?

+
   // Called prior to running each test. The delegate may alter the CommandLine
   // and options used to launch the subprocess. Additionally the client may
   // return a TestState that is destroyed once the test completes as well as
   // once the test process is launched.
   //
   // NOTE: this is not called if --single_process is supplied.
   virtual scoped_ptr<TestState> PreRunTest(
       base::CommandLine* command_line,
       base::TestLauncher::LaunchOptions* test_launch_options);
 
@@ skipping 12 matching lines @@
                 int default_jobs,
                 int argc,
                 char** argv) WARN_UNUSED_RESULT;
 
 TestLauncherDelegate* GetCurrentTestLauncherDelegate();
 ContentMainParams* GetContentMainParams();
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_TEST_LAUNCHER_H_