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

base/test/launcher/test_launcher.cc

Index: base/test/launcher/test_launcher.cc
diff --git a/base/test/launcher/test_launcher.cc b/base/test/launcher/test_launcher.cc
index b3e186c8d9445e06c064d1ee93d1c61f5e1c31ea..dca272037cc86c3be3a5863e25a0fe026718f2eb 100644
--- a/base/test/launcher/test_launcher.cc
+++ b/base/test/launcher/test_launcher.cc
@@ -43,15 +43,6 @@
 
 namespace base {
 
-// 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,
-                                      bool use_job_objects,
-                                      base::TimeDelta timeout,
-                                      bool* was_timeout);
-
 // See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nkdTP7sstSc/uT3FaE_sgkAJ .
 using ::operator<<;
 
@@ -218,7 +209,6 @@
 void DoLaunchChildTestProcess(
     const CommandLine& command_line,
     base::TimeDelta timeout,
-    bool use_job_objects,
     bool redirect_stdio,
     scoped_refptr<MessageLoopProxy> message_loop_proxy,
     const TestLauncher::LaunchChildGTestProcessCallback& callback) {
@@ -270,7 +260,7 @@
 
   bool was_timeout = false;
   int exit_code = LaunchChildTestProcessWithOptions(
-      command_line, options, use_job_objects, timeout, &was_timeout);
+      command_line, options, timeout, &was_timeout);
 
   if (redirect_stdio) {
 #if defined(OS_WIN)
@@ -352,7 +342,7 @@
     worker_pool_owner_->pool()->Shutdown();
 }
 
-bool TestLauncher::Run() {
+bool TestLauncher::Run(int argc, char** argv) {
   if (!Init())
     return false;
 
@@ -404,7 +394,6 @@
     const CommandLine& command_line,
     const std::string& wrapper,
     base::TimeDelta timeout,
-    bool use_job_objects,
     const LaunchChildGTestProcessCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ -422,7 +411,6 @@
       Bind(&DoLaunchChildTestProcess,
            new_command_line,
            timeout,
-           use_job_objects,
            redirect_stdio,
            MessageLoopProxy::current(),
            Bind(&TestLauncher::OnLaunchTestProcessFinished,
@@ -956,6 +944,27 @@
   return snippet;
 }
 
+int LaunchChildGTestProcess(const CommandLine& command_line,
+                            const std::string& wrapper,
+                            base::TimeDelta timeout,
+                            bool* was_timeout) {
+  LaunchOptions options;
+
+#if defined(OS_POSIX)
+  // On POSIX, we launch the test in a new process group with pgid equal to
+  // its pid. Any child processes that the test may create will inherit the
+  // same pgid. This way, if the test is abruptly terminated, we can clean up
+  // any orphaned child processes it may have left behind.
+  options.new_process_group = true;
+#endif
+
+  return LaunchChildTestProcessWithOptions(
+      PrepareCommandLineForGTest(command_line, wrapper),
+      options,
+      timeout,
+      was_timeout);
+}
+
 CommandLine PrepareCommandLineForGTest(const CommandLine& command_line,
                                        const std::string& wrapper) {
   CommandLine new_command_line(command_line.GetProgram());
@@ -985,10 +994,8 @@
   return new_command_line;
 }
 
-// TODO(phajdan.jr): Move to anonymous namespace.
 int LaunchChildTestProcessWithOptions(const CommandLine& command_line,
                                       const LaunchOptions& options,
-                                      bool use_job_objects,
                                       base::TimeDelta timeout,
                                       bool* was_timeout) {
 #if defined(OS_POSIX)
@@ -1001,26 +1008,23 @@
 #if defined(OS_WIN)
   DCHECK(!new_options.job_handle);
 
-  win::ScopedHandle job_handle;
-  if (use_job_objects) {
-    job_handle.Set(CreateJobObject(NULL, NULL));
-    if (!job_handle.IsValid()) {
-      LOG(ERROR) << "Could not create JobObject.";
-      return -1;
-    }
-
-    // Allow break-away from job since sandbox and few other places rely on it
-    // on Windows versions prior to Windows 8 (which supports nested jobs).
-    // TODO(phajdan.jr): Do not allow break-away on Windows 8.
-    if (!SetJobObjectLimitFlags(job_handle.Get(),
-                                JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE |
-                                JOB_OBJECT_LIMIT_BREAKAWAY_OK)) {
-      LOG(ERROR) << "Could not SetJobObjectLimitFlags.";
-      return -1;
-    }
-
-    new_options.job_handle = job_handle.Get();
-  }
+  win::ScopedHandle job_handle(CreateJobObject(NULL, NULL));
+  if (!job_handle.IsValid()) {
+    LOG(ERROR) << "Could not create JobObject.";
+    return -1;
+  }
+
+  // Allow break-away from job since sandbox and few other places rely on it
+  // on Windows versions prior to Windows 8 (which supports nested jobs).
+  // TODO(phajdan.jr): Do not allow break-away on Windows 8.
+  if (!SetJobObjectLimitFlags(job_handle.Get(),
+                              JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE |
+                              JOB_OBJECT_LIMIT_BREAKAWAY_OK)) {
+    LOG(ERROR) << "Could not SetJobObjectLimitFlags.";
+    return -1;
+  }
+
+  new_options.job_handle = job_handle.Get();
 #endif  // defined(OS_WIN)
 
 #if defined(OS_LINUX)