| Index: tools/telemetry/telemetry/core/backends/webdriver/webdriver_desktop_browser_finder.py
|
| diff --git a/tools/telemetry/telemetry/core/backends/webdriver/webdriver_desktop_browser_finder.py b/tools/telemetry/telemetry/core/backends/webdriver/webdriver_desktop_browser_finder.py
|
| index e0f43a5d2a8c50ea9fb6f1097f13e8d77c1cb003..c89594c9788f423f0d979a214fe622c752801e3f 100644
|
| --- a/tools/telemetry/telemetry/core/backends/webdriver/webdriver_desktop_browser_finder.py
|
| +++ b/tools/telemetry/telemetry/core/backends/webdriver/webdriver_desktop_browser_finder.py
|
| @@ -22,16 +22,6 @@ try:
|
| except ImportError:
|
| webdriver = None
|
|
|
| -ALL_BROWSER_TYPES = []
|
| -if webdriver:
|
| - ALL_BROWSER_TYPES = [
|
| - 'internet-explorer',
|
| - 'internet-explorer-x64']
|
| -else:
|
| - logging.warning('Webdriver backend is unsupported without selenium pylib. '
|
| - 'For installation of selenium pylib, please refer to '
|
| - 'https://code.google.com/p/selenium/wiki/PythonBindings.')
|
| -
|
|
|
| class PossibleWebDriverBrowser(possible_browser.PossibleBrowser):
|
| """A browser that can be controlled through webdriver API."""
|
| @@ -40,8 +30,9 @@ class PossibleWebDriverBrowser(possible_browser.PossibleBrowser):
|
| target_os = sys.platform.lower()
|
| super(PossibleWebDriverBrowser, self).__init__(browser_type, target_os,
|
| finder_options, False)
|
| - assert browser_type in ALL_BROWSER_TYPES, \
|
| - 'Please add %s to ALL_BROWSER_TYPES' % browser_type
|
| + assert browser_type in FindAllBrowserTypes(), \
|
| + ('Please add %s to webdriver_desktop_browser_finder.FindAllBrowserTypes'
|
| + % browser_type)
|
|
|
| def CreateWebDriverBackend(self, platform_backend):
|
| raise NotImplementedError()
|
| @@ -90,6 +81,17 @@ class PossibleDesktopIE(PossibleWebDriverBrowser):
|
| def SelectDefaultBrowser(_):
|
| return None
|
|
|
| +def FindAllBrowserTypes():
|
| + if webdriver:
|
| + return [
|
| + 'internet-explorer',
|
| + 'internet-explorer-x64']
|
| + else:
|
| + logging.warning('Webdriver backend is unsupported without selenium pylib. '
|
| + 'For installation of selenium pylib, please refer to '
|
| + 'https://code.google.com/p/selenium/wiki/PythonBindings.')
|
| + return []
|
| +
|
| def FindAllAvailableBrowsers(finder_options):
|
| """Finds all the desktop browsers available on this machine."""
|
| browsers = []
|
|
|