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

tests/standalone/io/test_runner_test.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 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;
 final LONG_TIMEOUT = 30;
 
 List<String> packageOptions() {
   if (Platform.packageRoot != null) {
     return <String>['--package-root=${Platform.packageRoot}'];
   } else if (Platform.packageConfig != null) {
     return <String>['--packages=${Platform.packageConfig}'];
@@ skipping 82 matching lines @@
         'custom_crash', getProcessTestFileName(), ["0", "0", "1", "1"], {});
     // The crash test sometimes times out. Run it with a large timeout
     // to help diagnose the delay.
     // The test loads a new executable, which may sometimes take a long time.
     // It involves a wait on the VM event loop, and possible system
     // delays.
     return _makeTestCase(name, LONG_TIMEOUT, crashCommand, expectations);
   }
 
   _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));
   }
 }
 
 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,
       maxBrowserProcesses,
       new DateTime.now(),
       [new CustomTestSuite(config)],
       [new EventListener()],
       TestController.finished);
 }
 
@@ skipping 21 matching lines @@
         break;
       case 'timeout':
         // This process should be killed by the test after DEFAULT_TIMEOUT
         new Timer(new Duration(hours: 42), () {});
         break;
       default:
         throw "Unknown option ${arguments[0]} passed to test_runner_test";
     }
   }
 }