Big merge from experimental to bleeding edge.

pkg/http/test/response_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 response_test;
 
 import 'dart:io';
 
 import 'package:unittest/unittest.dart';
 import 'package:http/http.dart' as http;
@@ skipping 28 matching lines @@
 
     // TODO(nweiz): test that this respects the inferred encoding when issue
     // 6284 is fixed.
   });
 
   group('.fromStream()', () {
     test('sets body', () {
       var stream = new ListInputStream();
       var streamResponse = new http.StreamedResponse(stream, 200, 13);
       var future = http.Response.fromStream(streamResponse)
-        .transform((response) => response.body);
+        .then((response) => response.body);
       expect(future, completion(equals("Hello, world!")));
 
       stream.write([72, 101, 108, 108, 111, 44, 32]);
       stream.write([119, 111, 114, 108, 100, 33]);
       stream.markEndOfStream();
     });
 
     test('sets bodyBytes', () {
       var stream = new ListInputStream();
       var streamResponse = new http.StreamedResponse(stream, 200, 5);
       var future = http.Response.fromStream(streamResponse)
-        .transform((response) => response.bodyBytes);
+        .then((response) => response.bodyBytes);
       expect(future, completion(equals([104, 101, 108, 108, 111])));
 
       stream.write([104, 101, 108, 108, 111]);
       stream.markEndOfStream();
     });
   });
 }