Add correct timing collection for new browser controller

tools/testing/dart/browser_controller.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.
 library browser;
 
 import "dart:async";
 import "dart:core";
 import "dart:io";
 
 import 'android.dart';
@@ skipping 428 matching lines @@
 
 
 /**
  * Describes a single test to be run int the browser.
  */
 class BrowserTest {
   // TODO(ricow): Add timeout callback instead of the string passing hack.
   Function doneCallback;
   String url;
   int timeout;
+  Stopwatch stopwatch;
   // We store this here for easy access when tests time out (instead of
   // capturing this in a closure)
   Timer timeoutTimer;
 
   // Used for debugging, this is simply a unique identifier assigned to each
   // test.
   int id;
   static int _idCounter = 0;
 
   BrowserTest(this.url, this.doneCallback, this.timeout) {
@@ skipping 107 matching lines @@
     if (testCache.containsKey(testId)) {
       doubleReportingTests.add(testId);
       return;
     }
 
     if (status.timeout) {
       // We don't do anything, this browser is currently being killed and
       // replaced.
     } else if (status.currentTest != null) {
       status.currentTest.timeoutTimer.cancel();
+      status.currentTest.stopwatch.stop();
+
       if (status.currentTest.id != testId) {
         print("Expected test id ${status.currentTest.id} for"
               "${status.currentTest.url}");
         print("Got test id ${testId}");
         print("Last test id was ${status.lastTest.id} for "
               "${status.currentTest.url}");
         throw("This should never happen, wrong test id");
       }
       testCache[testId] = status.currentTest.url;
-      status.currentTest.doneCallback(output);
+      status.currentTest.doneCallback(output,
+                                      status.currentTest.stopwatch.elapsed);
       status.lastTest = status.currentTest;
       status.currentTest = null;
     } else {
       print("\nThis is bad, should never happen, handleResult no test");
       print("URL: ${status.lastTest.url}");
       print(output);
       terminate().then((_) {
         exit(1);
       });
     }
@@ skipping 40 matching lines @@
         }
         if (success) {
           browserStatus[browser.id] = new BrowserTestingStatus(browser);
         } else {
           // TODO(ricow): Handle this better.
           print("This is bad, should never happen, could not start browser");
           exit(1);
         }
       });
     });
-
-    status.currentTest.doneCallback("TIMEOUT");
+    status.currentTest.stopwatch.stop();
+    status.currentTest.doneCallback("TIMEOUT",
+                                    status.currentTest.stopwatch.elapsed);
     status.currentTest = null;
   }
 
   BrowserTest getNextTest(String browserId) {
     if (testQueue.isEmpty) return null;
     var status = browserStatus[browserId];
     if (status == null) return null;
     DebugLogger.info("${new DateTime.now()}: Handling getNext for browser "
                      "${browserId} timeout status: ${status.timeout}");
 
     // We are currently terminating this browser, don't start a new test.
     if (status.timeout) return null;
     BrowserTest test = testQueue.removeLast();
     if (status.currentTest == null) {
       status.currentTest = test;
     } else {
       // TODO(ricow): Handle this better.
       print("This is bad, should never happen, getNextTest all full");
       print("This happened for browser $browserId");
       print("Old test was: ${status.currentTest.url}");
       print("Timed out tests:");
       for (var v in timedOut) {
         print("  $v");
       }
       exit(1);
     }
     Timer timer = new Timer(new Duration(seconds: test.timeout),
                             () { handleTimeout(status); });
     status.currentTest.timeoutTimer = timer;
+    status.currentTest.stopwatch = new Stopwatch()..start();
     return test;
   }
 
   void queueTest(BrowserTest test) {
     testQueue.add(test);
   }
 
   void printDoubleReportingTests() {
     if (doubleReportingTests.length == 0) return;
     // TODO(ricow): die on double reporting.
@@ skipping 243 matching lines @@
 </head>
   <body onload="startTesting()">
     Dart test driver, number of tests: <div id="number"></div>
     <iframe id="embedded_iframe"></iframe>
   </body>
 </html>
 """;
     return driverContent;
   }
 }