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

tools/testing/dart/browser_controller.dart

Index: tools/testing/dart/browser_controller.dart
diff --git a/tools/testing/dart/browser_controller.dart b/tools/testing/dart/browser_controller.dart
index e12cdd6ecb83832191dbaffe75e6e70c948bcf5f..e7012d06157e6f0bd7a74b1cef3596478d5db760 100644
--- a/tools/testing/dart/browser_controller.dart
+++ b/tools/testing/dart/browser_controller.dart
@@ -249,12 +249,6 @@ abstract class Browser {
 
   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);
 }
@@ -627,9 +621,6 @@ class AndroidBrowser extends Browser {
   }
 
   String toString() => _config.name;
-
-  String get deviceIdMessage =>
-      'Android device id: ${_adbDevice.deviceId}\n';
 }
 
 
@@ -697,9 +688,6 @@ class AndroidChrome extends Browser {
   }
 
   String toString() => "chromeOnAndroid";
-
-  String get deviceIdMessage =>
-      'Android device id: ${_adbDevice.deviceId}\n';
 }
 
 
@@ -1000,7 +988,7 @@ class BrowserTestRunner {
       var browserTestOutput = new BrowserTestOutput(
           status.currentTest.delayUntilTestStarted,
           status.currentTest.stopwatch.elapsed,
-          status.browser.deviceIdMessage + output,
+          output,
           status.browser.testBrowserOutput);
       status.currentTest.doneCallback(browserTestOutput);
 
@@ -1052,7 +1040,6 @@ class BrowserTestRunner {
     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((_) {
@@ -1067,7 +1054,7 @@ class BrowserTestRunner {
       var browserTestOutput = new BrowserTestOutput(
           status.currentTest.delayUntilTestStarted,
           status.currentTest.stopwatch.elapsed,
-          deviceMessage + lastKnownMessage,
+          lastKnownMessage,
           status.browser.testBrowserOutput,
           didTimeout: true);
       status.currentTest.doneCallback(browserTestOutput);