Telemetry --device

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

Index: tools/telemetry/telemetry/core/backends/chrome/ios_browser_finder.py
diff --git a/tools/telemetry/telemetry/core/backends/chrome/ios_browser_finder.py b/tools/telemetry/telemetry/core/backends/chrome/ios_browser_finder.py
index f8dd74eefbdc55e8db28ef9ca18e57a34a548c16..771fd5eb1c10583a01c2e1bffdfc4bdfe706ed76 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/ios_browser_finder.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/ios_browser_finder.py
@@ -14,6 +14,7 @@ from telemetry.core import platform
 from telemetry.core import possible_browser
 from telemetry.core.backends.chrome_inspector import inspector_backend
 from telemetry.core.backends.chrome import ios_browser_backend
+from telemetry.core.platform import ios_device
 from telemetry.core.platform import ios_platform_backend
 
 
@@ -66,21 +67,12 @@ def FindAllBrowserTypes(_):
   return IOS_BROWSERS.values()
 
 
-@decorators.Cache
-def _IsIosDeviceAttached():
-  devices = subprocess.check_output('system_profiler SPUSBDataType', shell=True)
-  for line in devices.split('\n'):
-    if line and re.match(r'\s*(iPod|iPhone|iPad):', line):
-      return True
-  return False
-
-
-def FindAllAvailableBrowsers(finder_options):
+def FindAllAvailableBrowsers(finder_options, device):
   """Find all running iOS browsers on connected devices."""
-  if not CanFindAvailableBrowsers():
+  if not isinstance(device, ios_device.IOSDevice):
     return []
 
-  if not _IsIosDeviceAttached():
+  if not CanFindAvailableBrowsers():
     return []
 
   options = finder_options.browser_options