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

tests/standalone/io/skipping_dart2js_compilations_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.
 
 // OtherResources=skipping_dart2js_compilations_helper.dart
 
 /*
  * This test makes sure that the "skipping Dart2Js compilations if the output is
  * already up to date" feature does work as it should.
  * Therefore this test ensures that compilations are only skipped if the last
  * modified date of the output of a dart2js compilation is newer than
  *   - the dart application to compile (including it's dependencies)
  *   - the dart2js snapshot
  * Furtheremore it ensure that a compilations is not skipped if any of the
  * necessary files could not be found (dart2js snapshots, previous dart2js
  * output (+deps file), dart application)
  */
 
 import 'package:expect/expect.dart';
 import 'package:path/path.dart';
 import 'dart:async';
 import 'dart:io';
+import '../../../tools/testing/dart/options.dart' as options;
 import '../../../tools/testing/dart/path.dart';
 import '../../../tools/testing/dart/test_suite.dart' as suite;
 import '../../../tools/testing/dart/test_runner.dart' as runner;
-import '../../../tools/testing/dart/test_options.dart' as options;
 import '../../../tools/testing/dart/utils.dart';
 
 /**
  * This class is reponsible for setting up the files necessary for this test
  * as well as touching a file.
  */
 class FileUtils {
   Directory tempDir;
   File testJs;
   File testJsDeps;
@@ skipping 107 matching lines @@
       Expect.isTrue(
           new File(fileUtils.scriptOutputPath.toNativePath()).existsSync());
     } else {
       Expect.isFalse(
           new File(fileUtils.scriptOutputPath.toNativePath()).existsSync());
     }
   }
 }
 
 runner.Command makeCompilationCommand(String testName, FileUtils fileUtils) {
-  var config = new options.TestOptionsParser().parse(['--timeout', '2'])[0];
+  var config = new options.OptionsParser().parse(['--timeout', '2'])[0];
   var createFileScript = Platform.script
       .resolve('skipping_dart2js_compilations_helper.dart')
       .toFilePath();
   var executable = Platform.executable;
   var arguments = [createFileScript, fileUtils.scriptOutputPath.toNativePath()];
   var bootstrapDeps = [Uri.parse("file://${fileUtils.testSnapshotFilePath}")];
   return runner.CommandBuilder.instance.getCompilationCommand(
       'dart2js',
       fileUtils.testJsFilePath.toNativePath(),
       false,
@@ skipping 87 matching lines @@
       throw error;
     }).then((_) {
       cleanup();
     });
   }
 
   // We need to wait some time to make sure that the files we 'touch' get a
   // bigger timestamp than the old ones
   new Timer(new Duration(seconds: 1), touchFilesAndRunTests);
 }