Telemetry --device

tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py

Index: tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py
diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py
index 908efb793dbcc4ec2bd2db6ae0209bd074fbaa7d..023b7652ee8424041c0745465429f7d3d51b8537 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py
@@ -22,8 +22,10 @@ def _IsRunningOnCrOS():
 
 class PossibleCrOSBrowser(possible_browser.PossibleBrowser):
   """A launchable CrOS browser instance."""
-  def __init__(self, browser_type, finder_options, cros_platform, is_guest):
-    super(PossibleCrOSBrowser, self).__init__(browser_type, 'cros', True)
+  def __init__(self, browser_type, device_id, finder_options, cros_platform,
+               is_guest):
+    super(PossibleCrOSBrowser, self).__init__(browser_type, 'cros', device_id,
+                                              True)
     assert browser_type in FindAllBrowserTypes(finder_options), (
         'Please add %s to cros_browser_finder.FindAllBrowserTypes()' %
          browser_type)
@@ -87,10 +89,10 @@ def FindAllBrowserTypes(_):
 def FindAllAvailableBrowsers(finder_options):
   """Finds all available CrOS browsers, locally and remotely."""
   if _IsRunningOnCrOS():
-    return [PossibleCrOSBrowser('system', finder_options,
+    return [PossibleCrOSBrowser('system', 'cros', finder_options,
                                 platform_module.GetHostPlatform(),
                                 is_guest=False),
-            PossibleCrOSBrowser('system-guest', finder_options,
+            PossibleCrOSBrowser('system-guest', 'cros', finder_options,
                                 platform_module.GetHostPlatform(),
                                 is_guest=True)]
 
@@ -129,7 +131,7 @@ def FindAllAvailableBrowsers(finder_options):
       logging.warn('P.S. Please, tell your manager how INANE this is.')
     raise browser_finder_exceptions.BrowserFinderException(str(ex))
 
-  return [PossibleCrOSBrowser('cros-chrome', finder_options, platform,
-                              is_guest=False),
-          PossibleCrOSBrowser('cros-chrome-guest', finder_options, platform,
-                              is_guest=True)]
+  return [PossibleCrOSBrowser('cros-chrome', device.device_id, finder_options,
+                              platform, is_guest=False),
+          PossibleCrOSBrowser('cros-chrome-guest', device.device_id,
+                              finder_options, platform, is_guest=True)]