Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(452)

Unified Diff: tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py

Issue 688903002: Do not save finder options in PossibleApp/PossibleBrowser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update PossibleBrowser.__init__ and Create callers. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py
diff --git a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py
index ad9cba7597d83b11978f481b16115952c1edf2f3..49768d5e9efa6acc28f0312877ead3e1c10d424e 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py
@@ -21,11 +21,11 @@ class PossibleDesktopBrowser(possible_browser.PossibleBrowser):
def __init__(self, browser_type, finder_options, executable, flash_path,
is_content_shell, browser_directory, is_local_build=False):
target_os = sys.platform.lower()
- super(PossibleDesktopBrowser, self).__init__(browser_type, target_os,
- finder_options, not is_content_shell)
- assert browser_type in FindAllBrowserTypes(finder_options), \
- ('Please add %s to desktop_browser_finder.FindAllBrowserTypes' %
- browser_type)
+ super(PossibleDesktopBrowser, self).__init__(
+ browser_type, target_os, not is_content_shell)
+ assert browser_type in FindAllBrowserTypes(finder_options), (
+ 'Please add %s to desktop_browser_finder.FindAllBrowserTypes' %
+ browser_type)
self._local_executable = executable
self._flash_path = flash_path
self._is_content_shell = is_content_shell
@@ -45,7 +45,7 @@ class PossibleDesktopBrowser(possible_browser.PossibleBrowser):
# pylint: disable=W0212
self._platform_backend = self._platform._platform_backend
- def Create(self):
+ def Create(self, finder_options):
if self._flash_path and not os.path.exists(self._flash_path):
logging.warning(
'Could not find Flash at %s. Continuing without Flash.\n'
@@ -55,13 +55,13 @@ class PossibleDesktopBrowser(possible_browser.PossibleBrowser):
self._InitPlatformIfNeeded()
- backend = desktop_browser_backend.DesktopBrowserBackend(
- self.finder_options.browser_options, self._local_executable,
+ browser_backend = desktop_browser_backend.DesktopBrowserBackend(
+ finder_options.browser_options, self._local_executable,
self._flash_path, self._is_content_shell, self._browser_directory,
- output_profile_path=self.finder_options.output_profile_path,
- extensions_to_load=self.finder_options.extensions_to_load)
+ output_profile_path=finder_options.output_profile_path,
+ extensions_to_load=finder_options.extensions_to_load)
return browser.Browser(
- backend, self._platform_backend, self._credentials_path)
+ browser_backend, self._platform_backend, self._credentials_path)
def SupportsOptions(self, finder_options):
if (len(finder_options.extensions_to_load) != 0) and self._is_content_shell:

Powered by Google App Engine
This is Rietveld 408576698