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

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

Issue 23619077: Introduce CrosBrowserWithOOBE, which exposes an oobe property. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: create_browser_with_oobe Created 7 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 2a790e5fa26df2f2e98a747dce5c2d4eb1258393..8d7a9e069e4ccdd43a1a7c43044f6bb31272a773 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py
@@ -7,6 +7,7 @@ import logging
from telemetry.core import browser
from telemetry.core import possible_browser
+from telemetry.core.backends.chrome import cros_browser_with_oobe
from telemetry.core.backends.chrome import cros_browser_backend
from telemetry.core.backends.chrome import cros_interface
from telemetry.core.platform import cros_platform_backend
@@ -32,13 +33,15 @@ class PossibleCrOSBrowser(possible_browser.PossibleBrowser):
raise Exception("Profile generation is not currently supported on Chrome"
" OS")
+ browser_options = self.finder_options.browser_options
backend = cros_browser_backend.CrOSBrowserBackend(
- self.browser_type, self.finder_options.browser_options,
- self._cri, self._is_guest,
+ self.browser_type, browser_options, self._cri, self._is_guest,
extensions_to_load=self.finder_options.extensions_to_load)
- b = browser.Browser(backend,
- cros_platform_backend.CrosPlatformBackend(self._cri))
- return b
+ platform = cros_platform_backend.CrosPlatformBackend(self._cri)
+ if browser_options.create_browser_with_oobe:
+ return cros_browser_with_oobe.CrOSBrowserWithOOBE(backend, platform)
+ else:
+ return browser.Browser(backend, platform)
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