Reapply "Stop working around issue 6984."

utils/pub/oauth2.dart

Index: utils/pub/oauth2.dart
diff --git a/utils/pub/oauth2.dart b/utils/pub/oauth2.dart
index a7800e4224bd02ae8eb0f74e38576848c28fcbfc..78cd4c2766cf2d2fb0a577c0fc43e25c96a9a3c6 100644
--- a/utils/pub/oauth2.dart
+++ b/utils/pub/oauth2.dart
@@ -177,13 +177,11 @@ Future<Client> _authorize() {
       if (queryString == null) queryString = '';
       response.statusCode = 302;
       response.headers.set('location', 'http://pub.dartlang.org/authorized');
-      return Futures.wait([
-        closeHttpResponse(request, response),
-        grant.handleAuthorizationResponse(queryToMap(queryString))
-      ]);
-    }).transform((results) {
+      response.outputStream.close();
+      return grant.handleAuthorizationResponse(queryToMap(queryString));
+    }).transform((client) {
       server.close();
-      return results[1];
+      return client;
     }), completer);
   });
   server.listen('127.0.0.1', 0);