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

This reverts commit 915c316c3431e193be1b025c557b5eee557e22d0.

This change seems to be breaking the angle_end2end_tests on Windows
GPU FYI bots:

http://build.chromium.org/p/chromium.gpu.fyi/builders/Win7%20Release%20%28NVIDIA%29
http://build.chromium.org/p/chromium.gpu.fyi/builders/Win8%20Release%20%28NVIDIA%29
http://build.chromium.org/p/chromium.gpu.fyi/builders/Win7%20Release%20%28ATI%29
http://build.chromium.org/p/chromium.gpu.fyi/builders/Win7%20Release%20dEQP%20%28NVIDIA%29

e.g.,

[1/949] EGLSurfaceTest.MessageLoopBug (UNKNOWN)
[2/949] EGLSurfaceTest.MessageLoopBugContext (UNKNOWN)
[3/949] EGLSurfaceTest.MakeCurrentTwice (UNKNOWN)
[4/949] EGLSurfaceTest.ResizeD3DWindow (UNKNOWN)
...

http://build.chromium.org/p/chromium.gpu.fyi/builders/Win7%20Release%20%28NVIDIA%29/builds/16863/steps/angle_end2end_tests/logs/stdio

BUG=501604
TBR=phadjanjr@chromium.org,geofflang@chromium.org

Review URL: https://codereview.chromium.org/1218843002

Cr-Commit-Position: refs/heads/master@{#336559}

1 files changed, 1 insertions, 4 deletions

diff --git a/gpu/angle_end2end_tests_main.cc b/gpu/angle_end2end_tests_main.cc
index 272cf29..008868c 100644
--- a/gpu/angle_end2end_tests_main.cc
+++ b/gpu/angle_end2end_tests_main.cc
@@ -26,12 +26,9 @@ int main(int argc, char** 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;
 }