Fix issue that cases the usesWebDriver getter in TestCase to always return false.

tools/testing/dart/test_runner.dart

Index: tools/testing/dart/test_runner.dart
diff --git a/tools/testing/dart/test_runner.dart b/tools/testing/dart/test_runner.dart
index 6376dd88359dd5a3d82c9f0e16b18b1377dd6a98..930a561c9374175571a75b1aadcf28c40a805290 100644
--- a/tools/testing/dart/test_runner.dart
+++ b/tools/testing/dart/test_runner.dart
@@ -77,7 +77,6 @@ class TestCase {
   String displayName;
   TestOutput output;
   bool isNegative;
-  bool usesWebDriver;
   Set<String> expectedOutcomes;
   TestCaseEvent completedHandler;
   TestInformation info;
@@ -88,8 +87,7 @@ class TestCase {
            this.completedHandler,
            this.expectedOutcomes,
            {this.isNegative: false,
-            this.info: null,
-            this.usesWebDriver: false}) {
+            this.info: null}) {
     if (!isNegative) {
       this.isNegative = displayName.contains("negative_test");
     }
@@ -166,6 +164,8 @@ class TestCase {
   List<String> get batchRunnerArguments => ['-batch'];
   List<String> get batchTestArguments => commands.last().arguments;
 
+  bool get usesWebDriver => TestUtils.usesWebDriver(configuration['runtime']);
+
   void completed() { completedHandler(this); }
 }
 
@@ -594,6 +594,9 @@ class RunningProcess {
       (testCase as BrowserTestCase).numRetries--;
       print("Potential flake. Re-running ${testCase.displayName} "
           "(${(testCase as BrowserTestCase).numRetries} attempt(s) remains)");
+      // When retrying we need to reset the timeout as well.
+      // Otherwise there will be no timeout handling for the retry.
+      timeoutTimer = null;

[Emily Fortuna, 2012/10/24 17:14:48]

This shouldn't be reached on the bots because the tests are run in batch mode. I
don't see how this change fixes anything?

[Mads Ager (google), 2012/10/24 17:56:03]

This is needed if step1 fails. I believe that only step2 which is running in the
browser is batched. If you make dart2js timeout by making the dart2js.dart main
entry point loop, the test will fail with a timeout. Then it will be retried,
and without this change dart2js will spin in the infinite loop and never be
killed. With this change dart2js compilation will timeout again and the result
of the test will be a timeout as it should be. I tested this change that way
locally before submitting.

       this.start();
     } else {
       testCase.completed();
@@ -610,8 +613,7 @@ class RunningProcess {
     process = null;
     int totalSteps = testCase.commands.length;
     String suffix =' (step $currentStep of $totalSteps)';
-    if (timedOut &&
-        !(testCase.usesWebDriver && !testCase.configuration['noBatch'])) {
+    if (timedOut) {
       // Non-webdriver test timed out before it could complete. Webdriver tests
       // run their own timeouts by timing from the launch of the browser (which
       // could be delayed).