Update from https://crrev.com/314320

base/test/launcher/unit_test_launcher.h

 // Copyright 2013 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 BASE_TEST_LAUNCHER_UNIT_TEST_LAUNCHER_H_
 #define BASE_TEST_LAUNCHER_UNIT_TEST_LAUNCHER_H_
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/test/launcher/test_launcher.h"
@@ skipping 37 matching lines @@
   // of current process. |test_names| is a vector of test full names
   // (e.g. "A.B"), |output_file| is path to the GTest XML output file.
   virtual CommandLine GetCommandLineForChildGTestProcess(
       const std::vector<std::string>& test_names,
       const base::FilePath& output_file) = 0;
 
   // Returns wrapper to use for child GTest process. Empty string means
   // no wrapper.
   virtual std::string GetWrapperForChildGTestProcess() = 0;
 
+  // Relaunch tests, e.g. after a crash.
+  virtual void RelaunchTests(TestLauncher* test_launcher,
+                             const std::vector<std::string>& test_names,
+                             int launch_flags) = 0;
+
  protected:
   ~UnitTestPlatformDelegate() {}
 };
 
+// Runs tests serially, each in its own process.
+void RunUnitTestsSerially(TestLauncher* test_launcher,
+                          UnitTestPlatformDelegate* platform_delegate,
+                          const std::vector<std::string>& test_names,
+                          int launch_flags);
+
+// Runs tests in batches (each batch in its own process).
+void RunUnitTestsBatch(TestLauncher* test_launcher,
+                       UnitTestPlatformDelegate* platform_delegate,
+                       const std::vector<std::string>& test_names,
+                       int launch_flags);
+
 // Test launcher delegate for unit tests (mostly to support batching).
 class UnitTestLauncherDelegate : public TestLauncherDelegate {
  public:
   UnitTestLauncherDelegate(UnitTestPlatformDelegate* delegate,
                            size_t batch_limit,
                            bool use_job_objects);
   ~UnitTestLauncherDelegate() override;
 
  private:
-  struct GTestCallbackState {
-    GTestCallbackState();
-    ~GTestCallbackState();
-
-    TestLauncher* test_launcher;
-    std::vector<std::string> test_names;
-    FilePath output_file;
-  };
-
   // TestLauncherDelegate:
   bool GetTests(std::vector<SplitTestName>* output) override;
   bool ShouldRunTest(const std::string& test_case_name,
                      const std::string& test_name) override;
   size_t RunTests(TestLauncher* test_launcher,
                   const std::vector<std::string>& test_names) override;
   size_t RetryTests(TestLauncher* test_launcher,
                     const std::vector<std::string>& test_names) override;
 
-  // Runs tests serially, each in its own process.
-  void RunSerially(TestLauncher* test_launcher,
-                   const std::vector<std::string>& test_names);
-
-  // Runs tests in batches (each batch in its own process).
-  void RunBatch(TestLauncher* test_launcher,
-                const std::vector<std::string>& test_names);
-
-  // Callback for batched tests.
-  void GTestCallback(const GTestCallbackState& callback_state,
-                     int exit_code,
-                     const TimeDelta& elapsed_time,
-                     bool was_timeout,
-                     const std::string& output);
-
-  // Callback for serialized tests.
-  void SerialGTestCallback(const GTestCallbackState& callback_state,
-                           const std::vector<std::string>& test_names,
-                           int exit_code,
-                           const TimeDelta& elapsed_time,
-                           bool was_timeout,
-                           const std::string& output);
-
-  // Interprets test results and reports to the test launcher. Returns true
-  // on success.
-  static bool ProcessTestResults(TestLauncher* test_launcher,
-                                 const std::vector<std::string>& test_names,
-                                 const base::FilePath& output_file,
-                                 const std::string& output,
-                                 int exit_code,
-                                 bool was_timeout,
-                                 std::vector<std::string>* tests_to_relaunch);
-
   ThreadChecker thread_checker_;
 
   UnitTestPlatformDelegate* platform_delegate_;
 
   // Maximum number of tests to run in a single batch.
   size_t batch_limit_;
 
   // Determines whether we use job objects on Windows.
   bool use_job_objects_;
 
   DISALLOW_COPY_AND_ASSIGN(UnitTestLauncherDelegate);
 };
 
 }   // namespace base
 
 #endif  // BASE_TEST_LAUNCHER_UNIT_TEST_LAUNCHER_H_