Big merge from experimental to bleeding edge.

utils/tests/pub/oauth2_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.
 
 library oauth2_test;
 
 import 'dart:io';
 import 'dart:json';
 import 'dart:uri';
 
@@ skipping 50 matching lines @@
     var server = new ScheduledServer();
     credentialsFile(server, 'access token',
         refreshToken: 'refresh token',
         expiration: new Date.now().subtract(new Duration(hours: 1)))
         .scheduleCreate();
 
     var pub = startPubLish(server);
     confirmPublish(pub);
 
     server.handle('POST', '/token', (request, response) {
-      return consumeInputStream(request.inputStream).transform((bytes) {
+      return consumeInputStream(request.inputStream).then((bytes) {
         var body = new String.fromCharCodes(bytes);
         expect(body, matches(
             new RegExp(r'(^|&)refresh_token=refresh\+token(&|$)')));
 
         response.headers.contentType = new ContentType("application", "json");
         response.outputStream.writeString(JSON.stringify({
           "access_token": "new access token",
           "token_type": "bearer"
         }));
         response.outputStream.close();
@@ skipping 110 matching lines @@
 
   expectLater(pub.nextLine().chain((line) {
     var match = new RegExp(r'[?&]redirect_uri=([0-9a-zA-Z%+-]+)[$&]')
         .firstMatch(line);
     expect(match, isNotNull);
 
     var redirectUrl = new Uri.fromString(decodeUriComponent(match.group(1)));
     redirectUrl = addQueryParameters(redirectUrl, {'code': 'access code'});
     return (new http.Request('GET', redirectUrl)..followRedirects = false)
       .send();
-  }).transform((response) {
+  }).then((response) {
     expect(response.headers['location'],
         equals(['http://pub.dartlang.org/authorized']));
   }), anything);
 
   handleAccessTokenRequest(server, accessToken);
 }
 
 void handleAccessTokenRequest(ScheduledServer server, String accessToken) {
   server.handle('POST', '/token', (request, response) {
-    return consumeInputStream(request.inputStream).transform((bytes) {
+    return consumeInputStream(request.inputStream).then((bytes) {
       var body = new String.fromCharCodes(bytes);
       expect(body, matches(new RegExp(r'(^|&)code=access\+code(&|$)')));
 
       response.headers.contentType = new ContentType("application", "json");
       response.outputStream.writeString(JSON.stringify({
         "access_token": accessToken,
         "token_type": "bearer"
       }));
       response.outputStream.close();
     });
   });
 }