Revert of Convert installer_util_unittests, sbox_integration_tests, sbox_validation_tests, sbox_unittests to …

base/test/launcher/test_launcher.h

Index: base/test/launcher/test_launcher.h
diff --git a/base/test/launcher/test_launcher.h b/base/test/launcher/test_launcher.h
index 600c4dec339f3fee2c83c591abd6212891f8490b..ec0b2c15a1c0fccf628468895e169b52f0b2196d 100644
--- a/base/test/launcher/test_launcher.h
+++ b/base/test/launcher/test_launcher.h
@@ -75,7 +75,7 @@
   ~TestLauncher();
 
   // Runs the launcher. Must be called at most once.
-  bool Run() WARN_UNUSED_RESULT;
+  bool Run(int argc, char** argv) WARN_UNUSED_RESULT;
 
   // Callback called after a child process finishes. First argument is the exit
   // code, second one is child process elapsed time, third one is true if
@@ -87,13 +87,11 @@
   // Launches a child process (assumed to be gtest-based binary) using
   // |command_line|. If |wrapper| is not empty, it is prepended to the final
   // command line. If the child process is still running after |timeout|, it
-  // is terminated. |use_job_objects| determines whether job objects are used
-  // on Windows (if unsure pass true). After the child process finishes
-  // |callback| is called on the same thread this method was called.
+  // is terminated. After the child process finishes |callback| is called
+  // on the same thread this method was called.
   void LaunchChildGTestProcess(const CommandLine& command_line,
                                const std::string& wrapper,
                                base::TimeDelta timeout,
-                               bool use_job_objects,
                                const LaunchChildGTestProcessCallback& callback);
 
   // Called when a test has finished running.
@@ -186,11 +184,28 @@
 std::string GetTestOutputSnippet(const TestResult& result,
                                  const std::string& full_output);
 
+// Launches a child process (assumed to be gtest-based binary)
+// using |command_line|. If |wrapper| is not empty, it is prepended
+// to the final command line. If the child process is still running
+// after |timeout|, it is terminated and |*was_timeout| is set to true.
+int LaunchChildGTestProcess(const CommandLine& command_line,
+                            const std::string& wrapper,
+                            base::TimeDelta timeout,
+                            bool* was_timeout);
+
 // Returns command line command line after gtest-specific processing
 // and applying |wrapper|.
 CommandLine PrepareCommandLineForGTest(const CommandLine& command_line,
                                        const std::string& wrapper);
 
+// Launches a child process using |command_line|. If the child process is still
+// running after |timeout|, it is terminated and |*was_timeout| is set to true.
+// Returns exit code of the process.
+int LaunchChildTestProcessWithOptions(const CommandLine& command_line,
+                                      const LaunchOptions& options,
+                                      base::TimeDelta timeout,
+                                      bool* was_timeout);
+
 }  // namespace base
 
 #endif  // BASE_TEST_LAUNCHER_TEST_LAUNCHER_H_