Big merge from experimental to bleeding edge.

tests/standalone/io/https_client_certificate_test.dart

Index: tests/standalone/io/https_client_certificate_test.dart
diff --git a/tests/standalone/io/https_client_certificate_test.dart b/tests/standalone/io/https_client_certificate_test.dart
index 572b30fc92bf6d49d117ffa4e1dd3855e5b17157..029c8fd2f38d86e1f3dc7c011b152f64253ea14f 100644
--- a/tests/standalone/io/https_client_certificate_test.dart
+++ b/tests/standalone/io/https_client_certificate_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:uri";
 import "dart:isolate";
@@ -64,7 +65,7 @@ Function test(Map options) {
       return completer.future;
     }
 
-    testConnect(true).chain(testConnect).then((_) {
+    testConnect(true).then(testConnect).then((_) {
         client.shutdown();
         server.close();
         Expect.throws(() => server.port);
@@ -88,7 +89,7 @@ void main() {
   InitializeSSL();
   // Test two connections in sequence.
   test({'certificateName': null})()
-      .chain(test({'certificateName': 'localhost_cert'}))
+      .then(test({'certificateName': 'localhost_cert'}))
       .then((_) {
     Expect.equals(2, numClientCertificatesReceived);
     keepAlive.close();