Big merge from experimental to bleeding edge.

pkg/http/test/utils.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 test_utils;
 
 import 'dart:io';
-import 'dart:json';
+import 'dart:json' as json;
 import 'dart:uri';
 
 import 'package:unittest/unittest.dart';
 import 'package:http/http.dart' as http;
 import 'package:http/src/utils.dart';
 
 /// The current server instance.
 HttpServer _server;
 
 /// The URL for the current server instance.
@@ skipping 62 matching lines @@
       });
 
       var outputEncoding;
       var encodingName = request.queryParameters['response-encoding'];
       if (encodingName != null) {
         outputEncoding = requiredEncodingForCharset(encodingName);
       } else {
         outputEncoding = Encoding.ASCII;
       }
 
-      var body = JSON.stringify(content);
+      var body = json.stringify(content);
       response.contentLength = body.length;
       response.outputStream.writeString(body, outputEncoding);
       response.outputStream.close();
     });
   };
 
   _server.listen("127.0.0.1", 0);
 }
 
 /// Stops the current HTTP server.
 void stopServer() {
   _server.close();
   _server = null;
 }
 
 /// A matcher that matches JSON that parses to a value that matches the inner
 /// matcher.
 Matcher parse(matcher) => new _Parse(matcher);
 
 class _Parse extends BaseMatcher {
   final Matcher _matcher;
 
   _Parse(this._matcher);
 
   bool matches(item, MatchState matchState) {
     if (item is! String) return false;
 
     var parsed;
     try {
-      parsed = JSON.parse(item);
+      parsed = json.parse(item);
     } catch (e) {
       return false;
     }
 
     return _matcher.matches(parsed, matchState);
   }
 
   Description describe(Description description) {
     return description.add('parses to a value that ')
       .addDescriptionOf(_matcher);
@@ skipping 33 matching lines @@
 const Matcher throwsRedirectLimitExceededException =
     const Throws(isRedirectLimitExceededException);
 
 class _RedirectLimitExceededException extends TypeMatcher {
   const _RedirectLimitExceededException() :
       super("RedirectLimitExceededException");
 
   bool matches(item, MatchState matchState) =>
     item is RedirectLimitExceededException;
 }