Big merge from experimental to bleeding edge.

tests/standalone/io/http_advanced_test.dart

Index: tests/standalone/io/http_advanced_test.dart
diff --git a/tests/standalone/io/http_advanced_test.dart b/tests/standalone/io/http_advanced_test.dart
index c08916b37444b595899b23bde4d6f232961338ce..cb8245ff62ac8cb33032e51dbb8f6fe4a836d014 100644
--- a/tests/standalone/io/http_advanced_test.dart
+++ b/tests/standalone/io/http_advanced_test.dart
@@ -7,8 +7,9 @@
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
-import "dart:isolate";
-import "dart:io";
+import 'dart:async';
+import 'dart:io';
+import 'dart:isolate';
 
 class TestServerMain {
   TestServerMain()
@@ -465,13 +466,13 @@ Future testFlush() {
 
 void main() {
   print('testHost()');
-  testHost().chain((_) {
+  testHost().then((_) {
   print('testExpires()');
-    return testExpires().chain((_) {
+    return testExpires().then((_) {
       print('testContentType()');
-      return testContentType().chain((_) {
+      return testContentType().then((_) {
         print('testCookies()');
-        return testCookies().chain((_) {
+        return testCookies().then((_) {
           print('testFlush()');
           return testFlush();
         });