Big merge from experimental to bleeding edge.

tests/standalone/io/options_test.dart

Index: tests/standalone/io/options_test.dart
diff --git a/tests/standalone/io/options_test.dart b/tests/standalone/io/options_test.dart
index 0c93f0381befc1b67d9126478ab956b72707704a..d326ab4a5265de3fac3e592fef5d8a69ee3980d6 100644
--- a/tests/standalone/io/options_test.dart
+++ b/tests/standalone/io/options_test.dart
@@ -11,9 +11,9 @@ main() {
 
   // Basic test for functionality.
   Expect.equals(3, opts.arguments.length);
-  Expect.equals(10, parseInt(opts.arguments[0]));
+  Expect.equals(10, int.parse(opts.arguments[0]));
   Expect.equals("options_test", opts.arguments[1]);
-  Expect.equals(20, parseInt(opts.arguments[2]));
+  Expect.equals(20, int.parse(opts.arguments[2]));
   Expect.isTrue(opts.executable.contains('dart'));
   Expect.isTrue(opts.script.replaceAll('\\', '/').
                 endsWith('tests/standalone/io/options_test.dart'));
@@ -21,15 +21,15 @@ main() {
   // Now add an additional argument.
   opts.arguments.add("Fourth");
   Expect.equals(4, opts.arguments.length);
-  Expect.equals(10, parseInt(opts.arguments[0]));
+  Expect.equals(10, int.parse(opts.arguments[0]));
   Expect.equals("options_test", opts.arguments[1]);
-  Expect.equals(20, parseInt(opts.arguments[2]));
+  Expect.equals(20, int.parse(opts.arguments[2]));
   Expect.equals("Fourth", opts.arguments[3]);
 
   // Check that a new options object still gets the original arguments.
   var opts2 = new Options();
   Expect.equals(3, opts2.arguments.length);
-  Expect.equals(10, parseInt(opts2.arguments[0]));
+  Expect.equals(10, int.parse(opts2.arguments[0]));
   Expect.equals("options_test", opts2.arguments[1]);
-  Expect.equals(20, parseInt(opts2.arguments[2]));
+  Expect.equals(20, int.parse(opts2.arguments[2]));
 }