Big merge from experimental to bleeding edge.

tests/html/xhr_cross_origin_test.dart

Index: tests/html/xhr_cross_origin_test.dart
diff --git a/tests/html/xhr_cross_origin_test.dart b/tests/html/xhr_cross_origin_test.dart
index d39af2c85e388bcfdb6e6e60f0f352ff50b9f429..22077f5b91a9e2899e95e3a9ad48439e8e188288 100644
--- a/tests/html/xhr_cross_origin_test.dart
+++ b/tests/html/xhr_cross_origin_test.dart
@@ -6,7 +6,7 @@ library XHRCrossOriginTest;
 import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_config.dart';
 import 'dart:html';
-import 'dart:json';
+import 'dart:json' as json;
 
 main() {
   useHtmlConfiguration();
@@ -23,7 +23,7 @@ main() {
     xhr.on.readyStateChange.add((e) {
       guardAsync(() {
         if (xhr.readyState == HttpRequest.DONE) {
-          validate(JSON.parse(xhr.response));
+          validate(json.parse(xhr.response));
         }
       });
     });
@@ -33,7 +33,7 @@ main() {
   test('XHR.get Cross-domain', () {
     var url = "http://localhost:9876/tests/html/xhr_cross_origin_data.txt";
     new HttpRequest.get(url, expectAsync1((xhr) {
-      var data = JSON.parse(xhr.response);
+      var data = json.parse(xhr.response);
       expect(data, contains('feed'));
       expect(data['feed'], contains('entry'));
       expect(data, isMap);