Big merge from experimental to bleeding edge.

pkg/oauth2/test/client_test.dart

Index: pkg/oauth2/test/client_test.dart
diff --git a/pkg/oauth2/test/client_test.dart b/pkg/oauth2/test/client_test.dart
index fba14a626e6479bde68464a0266688a391afb7c0..af8e7e47440d5d939d37584789ae87477ffb7f41 100644
--- a/pkg/oauth2/test/client_test.dart
+++ b/pkg/oauth2/test/client_test.dart
@@ -63,7 +63,7 @@ void main() {
         return new Future.immediate(new http.Response('good job', 200));
       });
 
-      expect(client.read(requestUri).transform((_) {
+      expect(client.read(requestUri).then((_) {
         expect(client.credentials.accessToken, equals('new access token'));
       }), completes);
     });
@@ -104,7 +104,7 @@ void main() {
         }), 200, headers: {'content-type': 'application/json'}));
       });
 
-      expect(client.refreshCredentials().transform((_) {
+      expect(client.refreshCredentials().then((_) {
         expect(client.credentials.accessToken, equals('new access token'));
       }), completes);
     });
@@ -156,7 +156,7 @@ void main() {
       });
 
       expect(
-          client.get(requestUri).transform((response) => response.statusCode),
+          client.get(requestUri).then((response) => response.statusCode),
           completion(equals(401)));
     });
 
@@ -178,7 +178,7 @@ void main() {
       });
 
       expect(
-          client.get(requestUri).transform((response) => response.statusCode),
+          client.get(requestUri).then((response) => response.statusCode),
           completion(equals(401)));
     });
 
@@ -198,7 +198,7 @@ void main() {
       });
 
       expect(
-          client.get(requestUri).transform((response) => response.statusCode),
+          client.get(requestUri).then((response) => response.statusCode),
           completion(equals(401)));
     });
 
@@ -218,7 +218,7 @@ void main() {
       });
 
       expect(
-          client.get(requestUri).transform((response) => response.statusCode),
+          client.get(requestUri).then((response) => response.statusCode),
           completion(equals(401)));
     });
   });