Index: tools/telemetry/telemetry/core/browser_finder.py |
diff --git a/tools/telemetry/telemetry/core/browser_finder.py b/tools/telemetry/telemetry/core/browser_finder.py |
index f98317b38cee6287a0376c04d06403e4f07dceaf..b863d6e351438519970535af08d67e838964f918 100644 |
--- a/tools/telemetry/telemetry/core/browser_finder.py |
+++ b/tools/telemetry/telemetry/core/browser_finder.py |
@@ -61,12 +61,7 @@ def FindBrowser(options): |
raise browser_finder_exceptions.BrowserFinderException( |
'--remote requires --browser=cros-chrome or cros-chrome-guest.') |
- devices = [] |
- if options.device and options.device != 'list': |
- devices = device_finder.GetSpecifiedDevices(options) |
- else: |
- devices = device_finder.GetAllAvailableDevices(options) |
- |
+ devices = device_finder.GetDevicesMatchingOptions(options) |
browsers = [] |
default_browsers = [] |
for device in devices: |
@@ -168,7 +163,7 @@ def GetAllAvailableBrowserTypes(options): |
Raises: |
BrowserFinderException: Options are improperly set, or an error occurred. |
""" |
- devices = device_finder.GetAllAvailableDevices(options) |
+ devices = device_finder.GetDevicesMatchingOptions(options) |
possible_browsers = [] |
for device in devices: |
possible_browsers.extend(GetAllAvailableBrowsers(options, device)) |