Index: tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py |
diff --git a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py |
index fea0b04f1fc6102691c06fd63856d23a9b931b52..91c8b91a71ad781ca26434ec05799a0f7beee68b 100644 |
--- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py |
+++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py |
@@ -70,15 +70,14 @@ class PossibleAndroidBrowser(possible_browser.PossibleBrowser): |
"""A launchable android browser instance.""" |
def __init__(self, browser_type, finder_options, android_platform, |
backend_settings, apk_name): |
- super(PossibleAndroidBrowser, self).__init__(browser_type, 'android', |
- finder_options, backend_settings.supports_tab_control) |
- assert browser_type in FindAllBrowserTypes(finder_options), \ |
- ('Please add %s to android_browser_finder.FindAllBrowserTypes' % |
+ super(PossibleAndroidBrowser, self).__init__( |
+ browser_type, 'android', backend_settings.supports_tab_control) |
+ assert browser_type in FindAllBrowserTypes(finder_options), ( |
+ 'Please add %s to android_browser_finder.FindAllBrowserTypes' % |
browser_type) |
self._platform = android_platform |
self._platform_backend = ( |
- android_platform._platform_backend # pylint: disable=W0212 |
- ) |
+ android_platform._platform_backend) # pylint: disable=W0212 |
self._backend_settings = backend_settings |
self._local_apk = None |
@@ -103,21 +102,21 @@ class PossibleAndroidBrowser(possible_browser.PossibleBrowser): |
def _InitPlatformIfNeeded(self): |
pass |
- def Create(self): |
+ def Create(self, finder_options): |
self._InitPlatformIfNeeded() |
- use_rndis_forwarder = (self.finder_options.android_rndis or |
- self.finder_options.browser_options.netsim or |
+ use_rndis_forwarder = (finder_options.android_rndis or |
+ finder_options.browser_options.netsim or |
platform.GetHostPlatform().GetOSName() != 'linux') |
- backend = android_browser_backend.AndroidBrowserBackend( |
- self.finder_options.browser_options, self._backend_settings, |
+ browser_backend = android_browser_backend.AndroidBrowserBackend( |
+ finder_options.browser_options, self._backend_settings, |
use_rndis_forwarder, |
- output_profile_path=self.finder_options.output_profile_path, |
- extensions_to_load=self.finder_options.extensions_to_load, |
- target_arch=self.finder_options.target_arch, |
+ output_profile_path=finder_options.output_profile_path, |
+ extensions_to_load=finder_options.extensions_to_load, |
+ target_arch=finder_options.target_arch, |
android_platform_backend=self._platform_backend) |
return browser.Browser( |
- backend, self._platform_backend, self._credentials_path) |
+ browser_backend, self._platform_backend, self._credentials_path) |
def SupportsOptions(self, finder_options): |