Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(423)

Unified Diff: tools/telemetry/telemetry/core/backends/chrome/ios_browser_finder.py

Issue 760653002: Telemetry --device (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 327f2afde82a17ce08f399ff525c6cbf3ebe3a13..fbb5ebb323ba6b14254d2e3115631cef28dee4b2 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 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
@@ -56,31 +57,16 @@ def SelectDefaultBrowser(_):
return None # TODO(baxley): Implement me.
-def CanFindAvailableBrowsers():
- # TODO(baxley): Add support for all platforms possible. Probably Linux,
- # probably not Windows.
- return platform.GetHostPlatform().GetOSName() == 'mac'
-
-
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):
"""Find all running iOS browsers on connected devices."""
- if not CanFindAvailableBrowsers():
+ if not ios_device.CanFindAvailableBrowsers():
return []
- if not _IsIosDeviceAttached():
+ if not ios_device.IsIosDeviceAttached():
return []
options = finder_options.browser_options

Powered by Google App Engine
This is Rietveld 408576698