Revert "unittest step 3 and 4: remove TestFramework.dart, make test.dart use"

tests/isolate/src/APIv2_unresolvedPortsBrowserTest.dart

Index: tests/isolate/src/APIv2_unresolvedPortsBrowserTest.dart
diff --git a/tests/isolate/src/APIv2_unresolvedPortsTest.dart b/tests/isolate/src/APIv2_unresolvedPortsBrowserTest.dart
similarity index 78%
copy from tests/isolate/src/APIv2_unresolvedPortsTest.dart
copy to tests/isolate/src/APIv2_unresolvedPortsBrowserTest.dart
index 76bf2a603ac584b23238d95050e2437e033c3983..88074e5cd1bec9efd73fd98dd6130b8a164da48f 100644
--- a/tests/isolate/src/APIv2_unresolvedPortsTest.dart
+++ b/tests/isolate/src/APIv2_unresolvedPortsBrowserTest.dart
@@ -4,15 +4,13 @@
 
 // spawns multiple isolates and sends unresolved ports between them.
 #library('unresolved_ports');
+#import('dart:dom'); // import added so test.dart can treat this as a webtest.
 #import('dart:isolate');
 #import('../../../lib/unittest/unittest.dart');
+#import('../../../lib/unittest/dom_config.dart');
 
-// This test does the following:
-//  - main spawns two isolates: 'tim' and 'beth'
-//  - 'tim' spawns an isolate: 'bob'
-//  - main starts a message chain:
-//       main -> beth -> tim -> bob -> main
-//    by giving 'beth' a send-port to 'tim'.
+// This is similar to APIv2_unresolvedPortsStandaloneTest but using
+// 'unittest.dart' so it can run to completion in browsers.
 
 bethIsolate() {
   port.receive((msg, reply) => msg[1].send(
@@ -31,15 +29,17 @@ bobIsolate() {
 }
 
 main() {
-  test('Message chain with unresolved ports', () {
+  useDomConfiguration();
+  asyncTest('Message chain with unresolved ports', 1, () {
     ReceivePort port = new ReceivePort();
-    port.receive(expectAsync2((msg, _) {
+    port.receive((msg, _) {
       expect(msg).equals('main says: Beth, find out if Tim is coming.'
         + '\nBeth says: Tim are you coming? And Bob?'
         + '\nTim says: Can you tell "main" that we are all coming?'
         + '\nBob says: we are all coming!');
       port.close();
-    }));
+      callbackDone();
+    });
 
     SendPort tim = spawnFunction(timIsolate);
     SendPort beth = spawnFunction(bethIsolate);