Cleanup deferred test fixes.

tests/compiler/dart2js_extra/deferred/deferred_function_test.dart

 // Copyright (c) 2013, 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.
 
 // Test that loading of a library (with top-level functions only) can
 // be deferred.
 
+import "package:expect/expect.dart";
 import 'dart:async';
 @lazy import 'deferred_function_library.dart';
 
 const lazy = const DeferredLibrary('deferred_function_library');
 
 isNoSuchMethodError(e) => e is NoSuchMethodError;
 
-class Expect {
-  static void isTrue(x) => Expect.equals(true, x);
-
-  static void isFalse(x) => Expect.equals(false, x);
-
-  static void equals(expected, actual) {
-    if (expected != actual) {
-      throw "Not equal. Expected: $expected. Got: $actual";
-    }
-  }
-  static void throws(fun, [test]) {
-    try {
-      fun();
-    } catch (e) {
-      if (!test(e)) throw "doesn't satisfy exception test";
-      return;
-    }
-    throw "didn't throw";
-  }
-}
-
 main() {
   print('unittest-suite-wait-for-done');
 
   Expect.throws(() { foo('a'); }, isNoSuchMethodError);
   int counter = 0;
   lazy.load().then((bool didLoad) {
     Expect.isTrue(didLoad);
     Expect.equals(1, ++counter);
     print('lazy was loaded');
     Expect.equals(42, foo('b'));
   });
   Expect.equals(0, counter);
   lazy.load().then((bool didLoad) {
     Expect.isFalse(didLoad);
     Expect.equals(2, ++counter);
     print('lazy was loaded');
     Expect.equals(42, foo('b'));
     print('unittest-suite-success');
   });
   Expect.equals(0, counter);
   Expect.throws(() { foo('a'); }, isNoSuchMethodError);
 }