Big merge from experimental to bleeding edge.

pkg/http/lib/src/response.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 response;
 
+import 'dart:async';
 import 'dart:io';
 import 'dart:scalarlist';
 
 import 'base_request.dart';
 import 'base_response.dart';
 import 'streamed_response.dart';
 import 'utils.dart';
 
 /// An HTTP response where the entire response body is known in advance.
 class Response extends BaseResponse {
@@ skipping 41 matching lines @@
         bodyBytes.length,
         request: request,
         headers: headers,
         isRedirect: isRedirect,
         persistentConnection: persistentConnection,
         reasonPhrase: reasonPhrase);
 
   /// Creates a new HTTP response by waiting for the full body to become
   /// available from a [StreamedResponse].
   static Future<Response> fromStream(StreamedResponse response) {
-    return consumeInputStream(response.stream).transform((body) {
+    return consumeInputStream(response.stream).then((body) {
       return new Response.bytes(
           body,
           response.statusCode,
           request: response.request,
           headers: response.headers,
           isRedirect: response.isRedirect,
           persistentConnection: response.persistentConnection,
           reasonPhrase: response.reasonPhrase);
     });
   }
 }
 
 /// Returns the encoding to use for a response with the given headers. This
 /// defaults to [Encoding.ISO_8859_1] if the headers don't specify a charset or
 /// if that charset is unknown.
 Encoding _encodingForHeaders(Map<String, String> headers) =>
   encodingForCharset(_contentTypeForHeaders(headers).charset);
 
 /// Returns the [ContentType] object for the given headers. Defaults to
 /// `application/octet-stream`.
 ContentType _contentTypeForHeaders(Map<String, String> headers) {
   var contentType = headers[HttpHeaders.CONTENT_TYPE];
   if (contentType != null) return new ContentType.fromString(contentType);
   return new ContentType("application", "octet-stream");
 }