Revert "Support disabling unit test batching. Use it for angle_end2end_tests"

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"
 
 namespace base {
 
 // Callback that runs a test suite and returns exit code.
 typedef base::Callback<int(void)> RunTestSuiteCallback;
 
 // Launches unit tests in given test suite. Returns exit code.
 int LaunchUnitTests(int argc,
                     char** argv,
                     const RunTestSuiteCallback& run_test_suite);
 
 // Same as above, but always runs tests serially.
 int LaunchUnitTestsSerially(int argc,
                             char** argv,
                             const RunTestSuiteCallback& run_test_suite);
 
-// Launches unit tests in given test suite. Returns exit code.
-// |default_jobs| is the default number of parallel test jobs.
-// |default_batch_limit| is the default size of test batch
-// (use 0 to disable batching).
-// |use_job_objects| determines whether to use job objects.
-int LaunchUnitTestsWithOptions(
-    int argc,
-    char** argv,
-    int default_jobs,
-    int default_batch_limit,
-    bool use_job_objects,
-    const RunTestSuiteCallback& run_test_suite);
-
 #if defined(OS_WIN)
 // Launches unit tests in given test suite. Returns exit code.
 // |use_job_objects| determines whether to use job objects.
 int LaunchUnitTests(int argc,
                     wchar_t** argv,
                     bool use_job_objects,
                     const RunTestSuiteCallback& run_test_suite);
 #endif  // defined(OS_WIN)
 
 // Delegate to abstract away platform differences for unit tests.
@@ skipping 66 matching lines @@
 
   // 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_