Big merge from experimental to bleeding edge.

pkg/http/lib/testing.dart

Index: pkg/http/lib/testing.dart
diff --git a/pkg/http/lib/testing.dart b/pkg/http/lib/testing.dart
index 2d9ccaf22f72394f6152c16e6d684a709d8f61df..4c750ce34a956475ed10620004b185e425770caa 100644
--- a/pkg/http/lib/testing.dart
+++ b/pkg/http/lib/testing.dart
@@ -10,14 +10,14 @@ library testing;
 /// allows test code to set up a local request handler in order to fake a server
 /// that responds to HTTP requests:
 ///
-///     import 'dart:json';
+///     import 'dart:json' as json;
 ///     import 'package:http/testing.dart';
 ///
 ///     var client = new MockClient((request) {
 ///       if (request.url.path != "/data.json") {
 ///         return new Response("", 404);
 ///       }
-///       return new Response(JSON.stringify({
+///       return new Response(json.stringify({
 ///         'numbers': [1, 4, 15, 19, 214]
 ///       }, 200, headers: {
 ///         'content-type': 'application/json'