Big merge from experimental to bleeding edge.

utils/tests/pub/pub_lish_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 pub_lish_test;
 
 import 'dart:io';
 import 'dart:json';
 
 import 'test_pub.dart';
 import '../../../pkg/unittest/lib/unittest.dart';
 import '../../pub/io.dart';
 
 void handleUploadForm(ScheduledServer server, [Map body]) {
   server.handle('GET', '/packages/versions/new.json', (request, response) {
-    return server.url.transform((url) {
+    return server.url.then((url) {
       expect(request.headers.value('authorization'),
           equals('Bearer access token'));
 
       if (body == null) {
         body = {
           'url': url.resolve('/upload').toString(),
           'fields': {
             'field1': 'value1',
             'field2': 'value2'
           }
         };
       }
 
       response.headers.contentType = new ContentType("application", "json");
       response.outputStream.writeString(JSON.stringify(body));
       response.outputStream.close();
     });
   });
 }
 
 void handleUpload(ScheduledServer server) {
   server.handle('POST', '/upload', (request, response) {
     // TODO(nweiz): Once a multipart/form-data parser in Dart exists, validate
     // that the request body is correctly formatted. See issue 6952.
-    return server.url.transform((url) {
+    return server.url.then((url) {
       response.statusCode = 302;
       response.headers.set('location', url.resolve('/create').toString());
       response.outputStream.close();
     });
   });
 }
 
 main() {
   setUp(() => normalPackage.scheduleCreate());
 
@@ skipping 345 matching lines @@
       response.outputStream.close();
     });
 
     expectLater(pub.nextErrLine(), equals('Invalid server response:'));
     expectLater(pub.nextErrLine(), equals(JSON.stringify(body)));
     pub.shouldExit(1);
 
     run();
   });
 }