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

base/test/launcher/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_TEST_LAUNCHER_H_
 #define BASE_TEST_LAUNCHER_TEST_LAUNCHER_H_
 
 #include <set>
 #include <string>
 
@@ skipping 57 matching lines @@
 
 // Launches tests using a TestLauncherDelegate.
 class TestLauncher {
  public:
   // Constructor. |parallel_jobs| is the limit of simultaneous parallel test
   // jobs.
   TestLauncher(TestLauncherDelegate* launcher_delegate, size_t parallel_jobs);
   ~TestLauncher();
 
   // Runs the launcher. Must be called at most once.
-  bool Run(int argc, char** argv) WARN_UNUSED_RESULT;
+  bool Run() 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
   // the child process was terminated because of a timeout, and fourth one
   // contains output of the child (stdout and stderr together).
   typedef Callback<void(int, const TimeDelta&, bool, const std::string&)>
       LaunchChildGTestProcessCallback;
 
   // 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. After the child process finishes |callback| is called
-  // on the same thread this method was called.
+  // 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.
   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.
   void OnTestFinished(const TestResult& result);
 
  private:
   bool Init() WARN_UNUSED_RESULT;
 
   // Runs all tests in current iteration. Uses callbacks to communicate success.
   void RunTests();
@@ skipping 72 matching lines @@
   // Worker pool used to launch processes in parallel.
   scoped_ptr<SequencedWorkerPoolOwner> worker_pool_owner_;
 
   DISALLOW_COPY_AND_ASSIGN(TestLauncher);
 };
 
 // Extract part from |full_output| that applies to |result|.
 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_