| OLD | NEW |
| 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 import android_browser_finder |
| 9 from telemetry import cros_browser_finder | 9 from telemetry import cros_browser_finder |
| 10 from telemetry import desktop_browser_finder | 10 from telemetry import desktop_browser_finder |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |
| OLD | NEW |