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

tools/testing/dart/main.dart

Index: tools/testing/dart/main.dart
diff --git a/tools/testing/dart/main.dart b/tools/testing/dart/main.dart
index 727cccf18b534913674585848b02ea090066e02e..ff2a0d1264180d49555116e52d204e360e1bbe6a 100644
--- a/tools/testing/dart/main.dart
+++ b/tools/testing/dart/main.dart
@@ -22,8 +22,8 @@
 /// `factory StandardTestSuite.forDirectory`.
 import "dart:io";
 
+import "options.dart";
 import "test_configurations.dart";
-import "test_options.dart";
 import "test_suite.dart";
 
 /// Runs all of the tests specified by the given command line [arguments].
@@ -32,8 +32,8 @@ void main(List<String> arguments) {
   TestUtils.setDartDirUri(Platform.script.resolve('../../..'));
 
   // Parse the command line arguments to a configuration.
-  var optionsParser = new TestOptionsParser();
-  var configurations = optionsParser.parse(arguments);
+  var parser = new OptionsParser();
+  var configurations = parser.parse(arguments);
   if (configurations == null || configurations.isEmpty) return;
 
   // Run all of the configured tests.