Fix ALL the pub tests.

utils/pub/http.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.
 
 /// Helpers for dealing with HTTP.
 library pub.http;
 
 import 'dart:async';
 import 'dart:io';
-import 'dart:json';
+import 'dart:json' as json;
 
 // TODO(nweiz): Make this import better.
 import '../../pkg/http/lib/http.dart' as http;
 import 'curl_client.dart';
 import 'io.dart';
 import 'log.dart' as log;
 import 'utils.dart';
 
 // TODO(nweiz): make this configurable
 /// The amount of time in milliseconds to allow HTTP requests before assuming
@@ skipping 29 matching lines @@
       var status = streamedResponse.statusCode;
       // 401 responses should be handled by the OAuth2 client. It's very
       // unlikely that they'll be returned by non-OAuth2 requests.
       if (status < 400 || status == 401) {
         return new Future.immediate(streamedResponse);
       }
 
       return http.Response.fromStream(streamedResponse).then((response) {
         throw new PubHttpException(response);
       });
-    }).catchError((e) {
-      e = getRealError(e);
+    }).catchError((asyncError) {
+      var e = getRealError(asyncError);
       if (e is SocketIOException &&
           e.osError != null &&
           (e.osError.errorCode == 8 ||
            e.osError.errorCode == -2 ||
            e.osError.errorCode == -5 ||
            e.osError.errorCode == 11004)) {
         throw 'Could not resolve URL "${request.url.origin}".';
       }
-      throw e;
+      throw asyncError;
     }), HTTP_TIMEOUT, 'fetching URL "${request.url}"');
   }
 }
 
 /// The HTTP client to use for all HTTP requests.
 final httpClient = new PubHttpClient();
 
 final curlClient = new PubHttpClient(new CurlClient());
 
 /// Handles a successful JSON-formatted response from pub.dartlang.org.
@@ skipping 24 matching lines @@
     invalidServerResponse(response);
   }
   throw errorMap['error']['message'];
 }
 
 /// Parses a response body, assuming it's JSON-formatted. Throws a user-friendly
 /// error if the response body is invalid JSON, or if it's not a map.
 Map parseJsonResponse(http.Response response) {
   var value;
   try {
-    value = JSON.parse(response.body);
+    value = json.parse(response.body);
   } catch (e) {
     // TODO(nweiz): narrow this catch clause once issue 6775 is fixed.
     invalidServerResponse(response);
   }
   if (value is! Map) invalidServerResponse(response);
   return value;
 }
 
 /// Throws an error describing an invalid response from the server.
 void invalidServerResponse(http.Response response) {
   throw 'Invalid server response:\n${response.body}';
 }
 
 /// Exception thrown when an HTTP operation fails.
 class PubHttpException implements Exception {
   final http.Response response;
 
   const PubHttpException(this.response);
 
   String toString() => 'HTTP error ${response.statusCode}: '
       '${response.reasonPhrase}';
 }