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

Side by Side Diff: tools/telemetry/telemetry/core/browser_finder.py

Issue 12278015: [Telemetry] Reorganize everything. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Re-add shebangs. Created 7 years, 10 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 """Finds browsers that can be controlled by telemetry.""" 4 """Finds browsers that can be controlled by telemetry."""
5 5
6 import logging 6 import logging
7 7
8 from telemetry import android_browser_finder 8 from telemetry.core.chrome import android_browser_finder
9 from telemetry import cros_browser_finder 9 from telemetry.core.chrome import cros_browser_finder
10 from telemetry import desktop_browser_finder 10 from telemetry.core.chrome import desktop_browser_finder
11 11
12 ALL_BROWSER_TYPES = ( 12 ALL_BROWSER_TYPES = (
13 desktop_browser_finder.ALL_BROWSER_TYPES + ',' + 13 desktop_browser_finder.ALL_BROWSER_TYPES + ',' +
14 android_browser_finder.ALL_BROWSER_TYPES + ',' + 14 android_browser_finder.ALL_BROWSER_TYPES + ',' +
15 cros_browser_finder.ALL_BROWSER_TYPES) 15 cros_browser_finder.ALL_BROWSER_TYPES)
16 16
17 class BrowserTypeRequiredException(Exception): 17 class BrowserTypeRequiredException(Exception):
18 pass 18 pass
19 19
20 def FindBrowser(options): 20 def FindBrowser(options):
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 """Returns an array of browser types supported on this system.""" 68 """Returns an array of browser types supported on this system."""
69 browsers = [] 69 browsers = []
70 browsers.extend(desktop_browser_finder.FindAllAvailableBrowsers(options)) 70 browsers.extend(desktop_browser_finder.FindAllAvailableBrowsers(options))
71 browsers.extend(android_browser_finder.FindAllAvailableBrowsers(options)) 71 browsers.extend(android_browser_finder.FindAllAvailableBrowsers(options))
72 browsers.extend(cros_browser_finder.FindAllAvailableBrowsers(options)) 72 browsers.extend(cros_browser_finder.FindAllAvailableBrowsers(options))
73 73
74 type_list = set([browser.browser_type for browser in browsers]) 74 type_list = set([browser.browser_type for browser in browsers])
75 type_list = list(type_list) 75 type_list = list(type_list)
76 type_list.sort() 76 type_list.sort()
77 return type_list 77 return type_list
OLDNEW
« no previous file with comments | « tools/telemetry/telemetry/core/browser_credentials_unittest.py ('k') | tools/telemetry/telemetry/core/browser_options.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698