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 0b39477d5be160df55f62e1c4e8b88319f732c7d..66b4aece591eba1681b8d39e0e3a76108f2f54b0 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 |
@@ -29,12 +29,12 @@ class PossibleWebDriverBrowser(possible_browser.PossibleBrowser): |
def __init__(self, browser_type, finder_options): |
target_os = sys.platform.lower() |
super(PossibleWebDriverBrowser, self).__init__(browser_type, target_os, |
- finder_options, False) |
+ supports_tab_control=False) |
assert browser_type in FindAllBrowserTypes(finder_options), \ |
('Please add %s to webdriver_desktop_browser_finder.FindAllBrowserTypes' |
% browser_type) |
- def CreateWebDriverBackend(self, platform_backend): |
+ def CreateWebDriverBackend(self, platform_backend, finder_options): |
raise NotImplementedError() |
def _InitPlatformIfNeeded(self): |
@@ -48,12 +48,9 @@ class PossibleWebDriverBrowser(possible_browser.PossibleBrowser): |
def Create(self, finder_options): |
self._InitPlatformIfNeeded() |
- backend = self.CreateWebDriverBackend(self._platform_backend) |
- return browser.Browser(backend, |
- self._platform_backend, |
- self._archive_path, |
- self._append_to_existing_wpr, |
- self._make_javascript_deterministic, |
+ backend = self.CreateWebDriverBackend( |
+ self._platform_backend, finder_options) |
+ return browser.Browser(backend, self._platform_backend, |
self._credentials_path) |
def SupportsOptions(self, finder_options): |
@@ -74,7 +71,7 @@ class PossibleDesktopIE(PossibleWebDriverBrowser): |
super(PossibleDesktopIE, self).__init__(browser_type, finder_options) |
self._architecture = architecture |
- def CreateWebDriverBackend(self, platform_backend): |
+ def CreateWebDriverBackend(self, platform_backend, finder_options): |
assert webdriver |
def DriverCreator(): |
ie_driver_exe = support_binaries.FindPath( |
@@ -83,7 +80,7 @@ class PossibleDesktopIE(PossibleWebDriverBrowser): |
'win') |
return webdriver.Ie(executable_path=ie_driver_exe) |
return webdriver_ie_backend.WebDriverIEBackend( |
- platform_backend, DriverCreator, self.finder_options.browser_options) |
+ platform_backend, DriverCreator, finder_options.browser_options) |
def SelectDefaultBrowser(_): |
return None |