Big merge from experimental to bleeding edge.

utils/tests/pub/pub_lish_test.dart

Index: utils/tests/pub/pub_lish_test.dart
diff --git a/utils/tests/pub/pub_lish_test.dart b/utils/tests/pub/pub_lish_test.dart
index 695557848e952a4732633a5d5bcb77ec44289b3a..5319c4667857e140c9a6c72957e70454d367c482 100644
--- a/utils/tests/pub/pub_lish_test.dart
+++ b/utils/tests/pub/pub_lish_test.dart
@@ -13,7 +13,7 @@ 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'));
 
@@ -38,7 +38,7 @@ 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();