Big merge from experimental to bleeding edge.

pkg/http/test/utils.dart

Index: pkg/http/test/utils.dart
diff --git a/pkg/http/test/utils.dart b/pkg/http/test/utils.dart
index 89440f88341ab08af414467d0e6cd30c33d7d479..9e9ae8b3408d37c5ab724bd4f8486fe0f41f3f18 100644
--- a/pkg/http/test/utils.dart
+++ b/pkg/http/test/utils.dart
@@ -5,7 +5,7 @@
 library test_utils;
 
 import 'dart:io';
-import 'dart:json';
+import 'dart:json' as json;
 import 'dart:uri';
 
 import 'package:unittest/unittest.dart';
@@ -88,7 +88,7 @@ void startServer() {
         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();
@@ -118,7 +118,7 @@ class _Parse extends BaseMatcher {
 
     var parsed;
     try {
-      parsed = JSON.parse(item);
+      parsed = json.parse(item);
     } catch (e) {
       return false;
     }