Add android device id to test output for failing tests.

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:convert" show LineSplitter, UTF8, JSON;
 import "dart:core";
 import "dart:io";
 
@@ skipping 229 matching lines @@
   /**
    * Get the output that was written so far to stdout/stderr/eventLog.
    */
   BrowserOutput get allBrowserOutput => _allBrowserOutput;
   BrowserOutput get testBrowserOutput => _testBrowserOutput;
 
   void resetTestBrowserOutput() {
     _testBrowserOutput = new BrowserOutput();
   }
 
+  /**
+   * Add useful info about the browser to the _testBrowserOutput.stdout,
+   * where it will be reported for failing tests.  Used to report which
+   * android device a failing test is running on.
+   */
+  void logBrowserInfoToTestBrowserOutput() { }
+
   String toString();
 
   /** Starts the browser loading the given url */
   Future<bool> start(String url);
 }
 
 class Safari extends Browser {
   /**
    * We get the safari version by parsing a version file
    */
@@ skipping 353 matching lines @@
 
   Future<bool> close() {
     if (_adbDevice != null) {
       return _adbDevice.forceStop(_config.package).then((_) {
         return _adbDevice.killAll().then((_) => true);
       });
     }
     return new Future.value(true);
   }
 
+  void logBrowserInfoToTestBrowserOutput() {
+    _testBrowserOutput.stdout.write(
+        'Android device id: ${_adbDevice.deviceId}\n');
+  }
+
   String toString() => _config.name;
 }
 
 
 class AndroidChrome extends Browser {
   static const String viewAction = 'android.intent.action.VIEW';
   static const String mainAction = 'android.intent.action.MAIN';
   static const String chromePackage = 'com.android.chrome';
   static const String browserPackage = 'com.android.browser';
   static const String firefoxPackage = 'org.mozilla.firefox';
@@ skipping 47 matching lines @@
 
   Future<bool> close() {
     if (_adbDevice != null) {
       return _adbDevice.forceStop(chromePackage).then((_) {
         return _adbDevice.killAll().then((_) => true);
       });
     }
     return new Future.value(true);
   }
 
+  void logBrowserInfoToTestBrowserOutput() {
+    _testBrowserOutput.stdout.write(
+        'Android device id: ${_adbDevice.deviceId}\n');
+  }
+
   String toString() => "chromeOnAndroid";
 }
 
 
 class Firefox extends Browser {
   static const String enablePopUp =
       'user_pref("dom.disable_open_during_load", false);';
   static const String disableDefaultCheck =
       'user_pref("browser.shell.checkDefaultBrowser", false);';
   static const String disableScriptTimeLimit =
@@ skipping 460 matching lines @@
       for (var v in timedOut) {
         print("  $v");
       }
       exit(1);
     }
 
     status.currentTest.timeoutTimer = createTimeoutTimer(test, status);
     status.currentTest.stopwatch = new Stopwatch()..start();
 
     // Reset the test specific output information (stdout, stderr) on the
-    // browser since a new test is begin started.
+    // browser, since a new test is being started.
     status.browser.resetTestBrowserOutput();
+    status.browser.logBrowserInfoToTestBrowserOutput();
 
     return test;
   }
 
   Timer createTimeoutTimer(BrowserTest test, BrowserTestingStatus status) {
     return new Timer(new Duration(seconds: test.timeout),
                      () { handleTimeout(status); });
   }
 
   Timer createNextTestTimer(BrowserTestingStatus status) {
@@ skipping 584 matching lines @@
     </div>
     <div id="embedded_iframe_div" class="test box">
       <iframe style="width:100%;height:100%;" id="embedded_iframe"></iframe>
     </div>
   </body>
 </html>
 """;
     return driverContent;
   }
 }