Big merge from experimental to bleeding edge.

tests/standalone/io/http_session_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:io";
+import 'dart:async';
+import 'dart:io';
 
 const SESSION_ID = "DARTSESSID";
 
 String getSessionId(List<Cookie> cookies) {
   var id = cookies.reduce(null, (last, cookie) {
     if (last != null) return last;
     if (cookie.name.toUpperCase() == SESSION_ID) {
       Expect.isTrue(cookie.httpOnly);
       return cookie.value;
     }
@@ skipping 27 matching lines @@
   HttpServer server = new HttpServer();
   server.listen("127.0.0.1", 0);
   var sessions = new Set();
   server.defaultRequestHandler = (request, response) {
     sessions.add(request.session().id);
     response.outputStream.close();
   };
 
   var futures = [];
   for (int i = 0; i < sessionCount; i++) {
-    futures.add(connectGetSession(server.port).chain((session) {
+    futures.add(connectGetSession(server.port).then((session) {
       Expect.isNotNull(session);
       Expect.isTrue(sessions.contains(session));
-      return connectGetSession(server.port, session).transform((session2) {
+      return connectGetSession(server.port, session).then((session2) {
         Expect.equals(session2, session);
         Expect.isTrue(sessions.contains(session2));
         return session2;
         });
     }));
   }
   Futures.wait(futures).then((clientSessions) {
     Expect.equals(sessions.length, sessionCount);
     Expect.setEquals(new Set.from(clientSessions), sessions);
     server.close();
@@ skipping 15 matching lines @@
   };
 
   var futures = [];
   for (int i = 0; i < sessionCount; i++) {
     futures.add(connectGetSession(server.port));
   }
   Futures.wait(futures).then((clientSessions) {
     Futures.wait(timeouts).then((_) {
       futures = [];
       for (var id in clientSessions) {
-        futures.add(connectGetSession(server.port, id).transform((session) {
+        futures.add(connectGetSession(server.port, id).then((session) {
           Expect.isNotNull(session);
           Expect.notEquals(id, session);
         }));
       }
       Futures.wait(futures).then((_) {
         server.close();
       });
     });
   });
 }
 
 void main() {
   testSessions(5);
   testTimeout(5);
 }