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

gpu/angle_end2end_tests_main.cc

 // 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.
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/angle/src/tests/test_utils/ANGLETest.h"
 
 namespace {
 
 int RunHelper(base::TestSuite* test_suite) {
   base::MessageLoop message_loop;
   return test_suite->Run();
 }
 
 }  // namespace
 
 int main(int argc, char** argv) {
   base::CommandLine::Init(argc, argv);
   testing::InitGoogleMock(&argc, argv);
   testing::AddGlobalTestEnvironment(new ANGLETestEnvironment());
   base::TestSuite test_suite(argc, argv);
-  int rt = base::LaunchUnitTestsWithOptions(
+  int rt = base::LaunchUnitTestsSerially(
       argc,
       argv,
-      1,  // Run tests serially.
-      0,  // Disable batching.
-      true,  // Use job objects.
       base::Bind(&RunHelper, base::Unretained(&test_suite)));
   return rt;
 }