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

Unified Diff: tools/telemetry/telemetry/core/backends/chrome/cros_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/cros_browser_finder.py
diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py
index 9e04ab0f873b3b6bf4402770ac7af01e2e6cc4ae..4f83be81705d5a2a0783f9c10b318af29f6c2b29 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py
@@ -22,10 +22,9 @@ def _IsRunningOnCrOS():
class PossibleCrOSBrowser(possible_browser.PossibleBrowser):
"""A launchable CrOS browser instance."""
def __init__(self, browser_type, finder_options, cros_platform, is_guest):
- super(PossibleCrOSBrowser, self).__init__(browser_type, 'cros',
- finder_options, True)
- assert browser_type in FindAllBrowserTypes(finder_options), \
- ('Please add %s to cros_browser_finder.FindAllBrowserTypes()' %
+ super(PossibleCrOSBrowser, self).__init__(browser_type, 'cros', True)
+ assert browser_type in FindAllBrowserTypes(finder_options), (
+ 'Please add %s to cros_browser_finder.FindAllBrowserTypes()' %
browser_type)
self._platform = cros_platform
self._platform_backend = (
@@ -38,22 +37,22 @@ class PossibleCrOSBrowser(possible_browser.PossibleBrowser):
def _InitPlatformIfNeeded(self):
pass
- def Create(self):
- if self.finder_options.output_profile_path:
+ def Create(self, finder_options):
+ if finder_options.output_profile_path:
raise NotImplementedError(
'Profile generation is not yet supported on CrOS.')
- browser_options = self.finder_options.browser_options
- backend = cros_browser_backend.CrOSBrowserBackend(
+ browser_options = finder_options.browser_options
+ browser_backend = cros_browser_backend.CrOSBrowserBackend(
browser_options, self._platform_backend.cri, self._is_guest,
- extensions_to_load=self.finder_options.extensions_to_load)
+ extensions_to_load=finder_options.extensions_to_load)
if browser_options.create_browser_with_oobe:
return cros_browser_with_oobe.CrOSBrowserWithOOBE(
- backend,
+ browser_backend,
self._platform_backend,
self._credentials_path)
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_guest:

Powered by Google App Engine
This is Rietveld 408576698