Big merge from experimental to bleeding edge.

tests/standalone/io/https_client_certificate_test.dart

 // Copyright (c) 2012, 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.
 
+import "dart:async";
 import "dart:io";
 import "dart:uri";
 import "dart:isolate";
 
 const SERVER_ADDRESS = "127.0.0.1";
 const HOST_NAME = "localhost";
 
 int numClientCertificatesReceived = 0;
 
 Function test(Map options) {
@@ skipping 42 matching lines @@
         response.inputStream.onClosed = () {
           completer.complete(false);  // Chained call will not send cert.
         };
       };
       conn.onError = (Exception e) {
         Expect.fail("Unexpected error in Https Client: $e");
       };
       return completer.future;
     }
 
-    testConnect(true).chain(testConnect).then((_) {
+    testConnect(true).then(testConnect).then((_) {
         client.shutdown();
         server.close();
         Expect.throws(() => server.port);
         // Run second test with a certificate name.
         completer.complete(null);
       });
     return completer.future;
   }
   return runTest;
 }
 
 void InitializeSSL() {
   var testPkcertDatabase =
       new Path.fromNative(new Options().script).directoryPath.append('pkcert/');
   SecureSocket.initialize(database: testPkcertDatabase.toNativePath(),
                           password: 'dartdart');
 }
 
 void main() {
   var keepAlive = new ReceivePort();
   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();
   });
 }