Big merge from experimental to bleeding edge.

tests/standalone/io/file_write_as_test.dart

Index: tests/standalone/io/file_write_as_test.dart
diff --git a/tests/standalone/io/file_write_as_test.dart b/tests/standalone/io/file_write_as_test.dart
index 466c06bb65ea82c8f7ab8c8d610e6a9ed2d8e766..fd53f07455c1d39a937d033410376272a72f732b 100644
--- a/tests/standalone/io/file_write_as_test.dart
+++ b/tests/standalone/io/file_write_as_test.dart
@@ -2,6 +2,7 @@
 // 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:async';
 import 'dart:io';
 import 'dart:isolate';
 
@@ -70,7 +71,7 @@ main() {
   var tempDir = new Directory('').createTempSync();
   testWriteAsBytesSync(tempDir);
   testWriteAsStringSync(tempDir);
-  testWriteAsBytes(tempDir).chain((_) {
+  testWriteAsBytes(tempDir).then((_) {
     return testWriteAsString(tempDir);
   }).then((_) {
     tempDir.deleteSync(recursive: true);