Big merge from experimental to bleeding edge.

pkg/http/test/multipart_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 multipart_test;
 
 import 'dart:io';
 import 'dart:utf';
 
 // TODO(nweiz): get rid of this import before packaging this
@@ skipping 11 matching lines @@
 Matcher bodyMatches(String pattern) => new _BodyMatches(pattern);
 
 class _BodyMatches extends BaseMatcher {
   final String _pattern;
 
   _BodyMatches(this._pattern);
 
   bool matches(item, MatchState matchState) {
     if (item is! http.MultipartRequest) return false;
 
-    var future = consumeInputStream(item.finalize()).transform((bodyBytes) {
+    var future = consumeInputStream(item.finalize()).then((bodyBytes) {
       var body = decodeUtf8(bodyBytes);
       var contentType = new ContentType.fromString(
           item.headers['content-type']);
       var boundary = contentType.parameters['boundary'];
       var expected = cleanUpLiteral(_pattern)
           .replaceAll("\n", "\r\n")
           .replaceAll("{{boundary}}", boundary);
 
       expect(body, equals(expected));
       expect(item.contentLength, equals(bodyBytes.length));
@@ skipping 153 matching lines @@
     expect(request, bodyMatches('''
         --{{boundary}}
         content-type: application/octet-stream
         content-disposition: form-data; name="file"
 
         hello
         --{{boundary}}--
         '''));
   });
 }