Revert "Add android device id to test output in test scripts."

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 231 matching lines @@
    */
   BrowserOutput get allBrowserOutput => _allBrowserOutput;
   BrowserOutput get testBrowserOutput => _testBrowserOutput;
 
   void resetTestBrowserOutput() {
     _testBrowserOutput = new BrowserOutput();
   }
 
   String toString();
 
-  /**
-   * Identifies the device the browser is running on.
-   * Used for testing on android devices.
-   */
-  String get deviceIdMessage => "";
-
   /** 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
    */
   static const String versionFile =
       "/Applications/Safari.app/Contents/version.plist";
@@ skipping 352 matching lines @@
   Future<bool> close() {
     if (_adbDevice != null) {
       return _adbDevice.forceStop(_config.package).then((_) {
         return _adbDevice.killAll().then((_) => true);
       });
     }
     return new Future.value(true);
   }
 
   String toString() => _config.name;
-
-  String get deviceIdMessage =>
-      'Android device id: ${_adbDevice.deviceId}\n';
 }
 
 
 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';
   static const String turnScreenOnPackage = 'com.google.dart.turnscreenon';
@@ 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);
   }
 
   String toString() => "chromeOnAndroid";
-
-  String get deviceIdMessage =>
-      'Android device id: ${_adbDevice.deviceId}\n';
 }
 
 
 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 =
       'user_pref("dom.max_script_run_time", 0);';
@@ skipping 280 matching lines @@
         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;
 
       // Report that the test is finished now
       var browserTestOutput = new BrowserTestOutput(
           status.currentTest.delayUntilTestStarted,
           status.currentTest.stopwatch.elapsed,
-          status.browser.deviceIdMessage + output,
+          output,
           status.browser.testBrowserOutput);
       status.currentTest.doneCallback(browserTestOutput);
 
       status.lastTest = status.currentTest;
       status.currentTest = null;
       status.nextTestTimeout = createNextTestTimer(status);
     } else {
       print("\nThis is bad, should never happen, handleResult no test");
       print("URL: ${status.lastTest.url}");
       print(output);
@@ skipping 31 matching lines @@
     // We simply kill the browser and starts up a new one!
     // We could be smarter here, but it does not seems like it is worth it.
     if (status.timeout) {
       DebugLogger.error(
           "Got test timeout for an already restarting browser");
       return;
     }
     status.timeout = true;
     timedOut.add(status.currentTest.url);
     var id = status.browser.id;
-    String deviceMessage = status.browser.deviceIdMessage;
 
     status.currentTest.stopwatch.stop();
     status.browser.close().then((_) {
       var lastKnownMessage =
           'Dom could not be fetched, since the test timed out.';
       if (status.currentTest.lastKnownMessage.length > 0) {
         lastKnownMessage = status.currentTest.lastKnownMessage;
       }
       // Wait until the browser is closed before reporting the test as timeout.
       // This will enable us to capture stdout/stderr from the browser
       // (which might provide us with information about what went wrong).
       var browserTestOutput = new BrowserTestOutput(
           status.currentTest.delayUntilTestStarted,
           status.currentTest.stopwatch.elapsed,
-          deviceMessage + lastKnownMessage,
+          lastKnownMessage,
           status.browser.testBrowserOutput,
           didTimeout: true);
       status.currentTest.doneCallback(browserTestOutput);
       status.lastTest = status.currentTest;
       status.currentTest = null;
 
       // We don't want to start a new browser if we are terminating.
       if (underTermination) return;
       restartBrowser(id);
     });
@@ skipping 698 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;
   }
 }