tests/html: removed usage of deprecated unittest features

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 'dart:async';
 import 'dart:convert';
 import 'dart:html';
 import 'dart:typed_data';
 import 'package:unittest/html_individual_config.dart';
 import 'package:unittest/unittest.dart';
 
-void fail(message) {
-  guardAsync(() {
-    expect(false, isTrue, reason: message);
-  });
-}
-
 main() {
   useHtmlIndividualConfiguration();
   // Cache blocker is a workaround for:
   // https://code.google.com/p/dart/issues/detail?id=11834
   var cacheBlocker = new DateTime.now().millisecondsSinceEpoch;
   var url = '/root_dart/tests/html/xhr_cross_origin_data.txt?'
       'cacheBlock=$cacheBlocker';
 
   void validate200Response(xhr) {
     expect(xhr.status, equals(200));
@@ skipping 23 matching lines @@
   group('supported_overrideMimeType', () {
     test('supported', () {
       expect(HttpRequest.supportsOverrideMimeType, isTrue);
     });
   });
 
   group('xhr', () {
     test('XHR No file', () {
       HttpRequest xhr = new HttpRequest();
       xhr.open("GET", "NonExistingFile", async: true);
-      xhr.onReadyStateChange.listen(expectAsyncUntil1((event) {
+      xhr.onReadyStateChange.listen(expectAsyncUntil((event) {
         if (xhr.readyState == HttpRequest.DONE) {
           validate404(xhr);
         }
       }, () => xhr.readyState == HttpRequest.DONE));
       xhr.send();
     });
 
     test('XHR file', () {
       var loadEndCalled = false;
 
       var xhr = new HttpRequest();
       xhr.open('GET', url, async: true);
-      xhr.onReadyStateChange.listen(expectAsyncUntil1((e) {
+      xhr.onReadyStateChange.listen(expectAsyncUntil((e) {
         if (xhr.readyState == HttpRequest.DONE) {
           validate200Response(xhr);
 
           Timer.run(expectAsync(() {
             expect(loadEndCalled, HttpRequest.supportsLoadEndEvent);
           }));
         }
       }, () => xhr.readyState == HttpRequest.DONE));
 
       xhr.onLoadEnd.listen((ProgressEvent e) {
@@ skipping 166 matching lines @@
       return HttpRequest.request(url).then(
         (xhr) {
           var serverHeader = xhr.responseHeaders['server'];
           expect(serverHeader, isNotNull);
           // Should be like: 'Dart/0.1 (dart:io)'
           expect(serverHeader.startsWith('Dart/'), isTrue);
         });
     });
   });
 }