"Reverting 16675-16676, 71-73"

tests/html/xhr_test.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 XHRTest;
 import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_config.dart';
 import 'dart:html';
 import 'dart:json';
 
 main() {
   useHtmlConfiguration();
-  var url = "../../../../tests/html/xhr_cross_origin_data.txt";
 
   test('XHR No file', () {
     HttpRequest xhr = new HttpRequest();
     xhr.open("GET", "NonExistingFile", true);
-    xhr.on.readyStateChange.add(expectAsyncUntil1((event) {
+    xhr.on.readyStateChange.add(expectAsync1((event) {
       if (xhr.readyState == HttpRequest.DONE) {
-        expect(xhr.status, equals(404));
+        expect(xhr.status, equals(0));
         expect(xhr.responseText, equals(''));
       }
-    }, () => xhr.readyState == HttpRequest.DONE));
-    xhr.send();
-  });
-
-  test('XHR file', () {
-    var xhr = new HttpRequest();
-    xhr.open('GET', url, true);
-    xhr.on.readyStateChange.add(expectAsyncUntil1((e) {
-      if (xhr.readyState == HttpRequest.DONE) {
-        expect(xhr.status, equals(200));
-        var data = JSON.parse(xhr.response);
-        expect(data, contains('feed'));
-        expect(data['feed'], contains('entry'));
-        expect(data, isMap);
-      }
-    }, () => xhr.readyState == HttpRequest.DONE));
+    }));
     xhr.send();
   });
 
   test('XHR.get No file', () {
     new HttpRequest.get("NonExistingFile", expectAsync1((xhr) {
       expect(xhr.readyState, equals(HttpRequest.DONE));
-      expect(xhr.status, equals(404));
+      expect(xhr.status, equals(0));
       expect(xhr.responseText, equals(''));
     }));
   });
-
-  test('XHR.get file', () {
-    var xhr = new HttpRequest.get(url, expectAsync1((event) {
-      expect(event.readyState, equals(HttpRequest.DONE));
-      expect(event.status, equals(200));
-      var data = JSON.parse(event.response);
-      expect(data, contains('feed'));
-      expect(data['feed'], contains('entry'));
-      expect(data, isMap);
-    }));
-  });
-
-  test('XHR.getWithCredentials No file', () {
-    new HttpRequest.getWithCredentials("NonExistingFile", expectAsync1((xhr) {
-      expect(xhr.status, equals(404));
-      expect(xhr.responseText, equals(''));
-    }));
-  });
-
-  test('XHR.getWithCredentials file', () {
-    new HttpRequest.getWithCredentials(url, expectAsync1((xhr) {
-      expect(xhr.status, equals(200));
-      var data = JSON.parse(xhr.response);
-      expect(data, contains('feed'));
-      expect(data['feed'], contains('entry'));
-      expect(data, isMap);
-    }));
-  });
 }