Big merge from experimental to bleeding edge.

tests/standalone/io/http_session_test.dart

Index: tests/standalone/io/http_session_test.dart
diff --git a/tests/standalone/io/http_session_test.dart b/tests/standalone/io/http_session_test.dart
index 515800973795aeb10986c41d91ed9de068997823..0b83bf4fb5935931f8f3bd624de9d0a4f63668a8 100644
--- a/tests/standalone/io/http_session_test.dart
+++ b/tests/standalone/io/http_session_test.dart
@@ -2,7 +2,8 @@
 // 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";
 
@@ -50,10 +51,10 @@ void testSessions(int sessionCount) {
 
   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;
@@ -89,7 +90,7 @@ void testTimeout(int sessionCount) {
     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);
         }));