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 6c57c9751a897c58fbaf113bd490807d30dbf033..7acc298308007f8862bf6a596e00a1001dcbac7d 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py
@@ -16,10 +16,6 @@ from telemetry.core.backends.chrome import cros_browser_backend
 from telemetry.core.backends.chrome import cros_browser_with_oobe
 
 
-def _IsRunningOnCrOS():
-  return platform_module.GetHostPlatform().GetOSName() == 'chromeos'
-
-
 class PossibleCrOSBrowser(possible_browser.PossibleBrowser):
   """A launchable CrOS browser instance."""
   def __init__(self, browser_type, finder_options, cros_platform, is_guest):
@@ -65,14 +61,14 @@ class PossibleCrOSBrowser(possible_browser.PossibleBrowser):
     pass
 
 def SelectDefaultBrowser(possible_browsers):
-  if _IsRunningOnCrOS():
+  if cros_device.IsRunningOnCrOS():
     for b in possible_browsers:
       if b.browser_type == 'system':
         return b
   return None
 
 def CanFindAvailableBrowsers(finder_options):
-  return (_IsRunningOnCrOS() or
+  return (cros_device.IsRunningOnCrOS() or
           finder_options.cros_remote or
           cros_interface.HasSSH())
 
@@ -84,9 +80,12 @@ def FindAllBrowserTypes(_):
       'system-guest',
   ]
 
-def FindAllAvailableBrowsers(finder_options):
+def FindAllAvailableBrowsers(finder_options, device):
   """Finds all available CrOS browsers, locally and remotely."""
-  if _IsRunningOnCrOS():
+  if not isinstance(device, cros_device.CrOSDevice):
+    return []
+
+  if cros_device.IsRunningOnCrOS():
     return [PossibleCrOSBrowser('system', finder_options,
                                 platform_module.GetHostPlatform(),
                                 is_guest=False),
@@ -94,16 +93,6 @@ def FindAllAvailableBrowsers(finder_options):
                                 platform_module.GetHostPlatform(),
                                 is_guest=True)]
 
-  if finder_options.cros_remote == None:
-    logging.debug('No --remote specified, will not probe for CrOS.')
-    return []
-
-  if not cros_interface.HasSSH():
-    logging.debug('ssh not found. Cannot talk to CrOS devices.')
-    return []
-  device = cros_device.CrOSDevice(
-      finder_options.cros_remote, finder_options.cros_remote_ssh_port,
-      finder_options.cros_ssh_identity)
   # Check ssh
   try:
     platform = platform_module.GetPlatformForDevice(device, finder_options)