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

tools/testing/dart/test_suite.dart

Index: tools/testing/dart/test_suite.dart
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
index cf9c46783f3ba210e94a0cb3e14e1efce4dabf1c..f3fafed4bd84d589c8e7f4a5079be0ae24e92415 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -520,7 +520,6 @@ class StandardTestSuite implements TestSuite {
 
       String dartWrapperFilename = '${tempDir.path}/test.dart';
       String compiledDartWrapperFilename = '${tempDir.path}/test.js';
-      String domLibraryImport = 'dart:dom';
 
       String htmlPath = '${tempDir.path}/test.html';
       if (!isWebTest) {
@@ -539,10 +538,8 @@ class StandardTestSuite implements TestSuite {
 
         File file = new File(dartWrapperFilename);
         RandomAccessFile dartWrapper = file.openSync(FileMode.WRITE);
-        dartWrapper.writeStringSync(DartTestWrapper(
-            domLibraryImport,
-            '$dartDir/tests/isolate/src/TestFramework.dart',
-            dartLibraryFilename));
+        dartWrapper.writeStringSync(
+            DartTestWrapper('$dartDir', dartLibraryFilename));

[Bill Hesse, 2012/04/20 08:49:46]

We know dartDir is a string, so '$dartDir' is just dartDir.

         dartWrapper.closeSync();
       } else {
         dartWrapperFilename = testPath;