Revert "Revert "Revert "Revert "Refactor test option parsing code.""""

tests/standalone/io/test_runner_test.dart

Index: tests/standalone/io/test_runner_test.dart
diff --git a/tests/standalone/io/test_runner_test.dart b/tests/standalone/io/test_runner_test.dart
index af37fb4a9ae318446dbb87797725ed9e10b503dd..90920e93221eaf8283734543501ea4c7198eee8c 100644
--- a/tests/standalone/io/test_runner_test.dart
+++ b/tests/standalone/io/test_runner_test.dart
@@ -6,11 +6,11 @@ import "dart:io";
 import "dart:isolate";
 import "dart:async";
 import "../../../tools/testing/dart/expectation.dart";
+import "../../../tools/testing/dart/options.dart";
 import "../../../tools/testing/dart/status_file.dart";
 import "../../../tools/testing/dart/test_runner.dart";
 import "../../../tools/testing/dart/test_suite.dart";
 import "../../../tools/testing/dart/test_progress.dart" as progress;
-import "../../../tools/testing/dart/test_options.dart";
 import "process_test_util.dart";
 
 final DEFAULT_TIMEOUT = 20;
@@ -113,8 +113,7 @@ class CustomTestSuite extends TestSuite {
   }
 
   _makeTestCase(name, timeout, command, expectations) {
-    var configuration =
-        new TestOptionsParser().parse(['--timeout', '$timeout'])[0];
+    var configuration = new OptionsParser().parse(['--timeout', '$timeout'])[0];
     return new TestCase(name, [command], configuration,
         new Set<Expectation>.from(expectations));
   }
@@ -123,7 +122,7 @@ class CustomTestSuite extends TestSuite {
 void testProcessQueue() {
   var maxProcesses = 2;
   var maxBrowserProcesses = maxProcesses;
-  var config = new TestOptionsParser().parse(['--nobatch'])[0];
+  var config = new OptionsParser().parse(['--noBatch'])[0];
   new ProcessQueue(
       config,
       maxProcesses,