| Index: telemetry/telemetry/internal/browser/browser_finder.py
|
| diff --git a/telemetry/telemetry/internal/browser/browser_finder.py b/telemetry/telemetry/internal/browser/browser_finder.py
|
| index 40f89b7a7c0e70f74d03fdedffaa3921c75036e9..242f491e96fbc21d75476b3f84dfe1dcff219167 100644
|
| --- a/telemetry/telemetry/internal/browser/browser_finder.py
|
| +++ b/telemetry/telemetry/internal/browser/browser_finder.py
|
| @@ -93,6 +93,19 @@
|
| '--browser must be specified. Available browsers:\n%s' %
|
| '\n'.join(sorted(set([b.browser_type for b in browsers]))))
|
|
|
| + if options.browser_type == 'any':
|
| + types = FindAllBrowserTypes(options)
|
| + def CompareBrowsersOnTypePriority(x, y):
|
| + x_idx = types.index(x.browser_type)
|
| + y_idx = types.index(y.browser_type)
|
| + return x_idx - y_idx
|
| + browsers.sort(CompareBrowsersOnTypePriority)
|
| + if len(browsers) >= 1:
|
| + browsers[0].UpdateExecutableIfNeeded()
|
| + return browsers[0]
|
| + else:
|
| + return None
|
| +
|
| matching_browsers = [b for b in browsers
|
| if b.browser_type == options.browser_type and
|
| b.SupportsOptions(options.browser_options)]
|
|
|