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

base/test/launcher/unit_test_launcher.cc

Index: base/test/launcher/unit_test_launcher.cc
diff --git a/base/test/launcher/unit_test_launcher.cc b/base/test/launcher/unit_test_launcher.cc
index 87784d96647fbc80d2f7b93b18dfb00e827a775e..c2511f32492b50a3fdb2f3a9180a946ca0dca95a 100644
--- a/base/test/launcher/unit_test_launcher.cc
+++ b/base/test/launcher/unit_test_launcher.cc
@@ -102,9 +102,8 @@
 
 class UnitTestLauncherDelegate : public TestLauncherDelegate {
  public:
-  explicit UnitTestLauncherDelegate(size_t batch_limit, bool use_job_objects)
-      : batch_limit_(batch_limit),
-        use_job_objects_(use_job_objects) {
+  explicit UnitTestLauncherDelegate(size_t batch_limit)
+      : batch_limit_(batch_limit) {
   }
 
   virtual ~UnitTestLauncherDelegate() {
@@ -187,7 +186,6 @@
         cmd_line,
         std::string(),
         TestTimeouts::test_launcher_timeout(),
-        use_job_objects_,
         Bind(&UnitTestLauncherDelegate::SerialGTestCallback,
              Unretained(this),
              callback_state,
@@ -229,7 +227,6 @@
         cmd_line,
         std::string(),
         timeout,
-        use_job_objects_,
         Bind(&UnitTestLauncherDelegate::GTestCallback,
              Unretained(this),
              callback_state));
@@ -439,9 +436,6 @@
 
   // 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_;
 };
 
 bool GetSwitchValueAsInt(const std::string& switch_name, int* result) {
@@ -458,10 +452,12 @@
   return true;
 }
 
-int LaunchUnitTestsInternal(const RunTestSuiteCallback& run_test_suite,
-                            int default_jobs,
-                            bool use_job_objects,
-                            const Closure& gtest_init) {
+int LaunchUnitTestsInternal(int argc,
+                            char** argv,
+                            const RunTestSuiteCallback& run_test_suite,
+                            int default_jobs) {
+  CommandLine::Init(argc, argv);
+
 #if defined(OS_ANDROID)
   // We can't easily fork on Android, just run the test suite directly.
   return run_test_suite.Run();
@@ -506,7 +502,7 @@
 
   base::TimeTicks start_time(base::TimeTicks::Now());
 
-  gtest_init.Run();
+  testing::InitGoogleTest(&argc, argv);
   TestTimeouts::Initialize();
 
   int batch_limit = kDefaultTestBatchLimit;
@@ -522,9 +518,9 @@
 
   MessageLoopForIO message_loop;
 
-  UnitTestLauncherDelegate delegate(batch_limit, use_job_objects);
+  UnitTestLauncherDelegate delegate(batch_limit);
   base::TestLauncher launcher(&delegate, default_jobs);
-  bool success = launcher.Run();
+  bool success = launcher.Run(argc, argv);
 
   fprintf(stdout,
           "Tests took %" PRId64 " seconds.\n",
@@ -534,53 +530,19 @@
   return (success ? 0 : 1);
 }
 
-void InitGoogleTestChar(int* argc, char** argv) {
-  testing::InitGoogleTest(argc, argv);
-}
-
-#if defined(OS_WIN)
-void InitGoogleTestWChar(int* argc, wchar_t** argv) {
-  testing::InitGoogleTest(argc, argv);
-}
-#endif  // defined(OS_WIN)
-
 }  // namespace
 
 int LaunchUnitTests(int argc,
                     char** argv,
                     const RunTestSuiteCallback& run_test_suite) {
-  CommandLine::Init(argc, argv);
   return LaunchUnitTestsInternal(
-      run_test_suite,
-      SysInfo::NumberOfProcessors(),
-      true,
-      Bind(&InitGoogleTestChar, &argc, argv));
+      argc, argv, run_test_suite, SysInfo::NumberOfProcessors());
 }
 
 int LaunchUnitTestsSerially(int argc,
                             char** argv,
                             const RunTestSuiteCallback& run_test_suite) {
-  CommandLine::Init(argc, argv);
-  return LaunchUnitTestsInternal(
-      run_test_suite,
-      1,
-      true,
-      Bind(&InitGoogleTestChar, &argc, argv));
+  return LaunchUnitTestsInternal(argc, argv, run_test_suite, 1);
 }
 
-#if defined(OS_WIN)
-int LaunchUnitTests(int argc,
-                    wchar_t** argv,
-                    bool use_job_objects,
-                    const RunTestSuiteCallback& run_test_suite) {
-  // Windows CommandLine::Init ignores argv anyway.
-  CommandLine::Init(argc, NULL);
-  return LaunchUnitTestsInternal(
-      run_test_suite,
-      SysInfo::NumberOfProcessors(),
-      use_job_objects,
-      Bind(&InitGoogleTestWChar, &argc, argv));
-}
-#endif  // defined(OS_WIN)
-
 }  // namespace base