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

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

Issue 436873003: Make telemetry platform a singleton (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 ecb534457fb8dba7af02631db37101ea3e739833..707c687a66a0f5fa4c92166c04ed3c6c016fb0d7 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py
@@ -12,7 +12,7 @@ from telemetry.core import browser
from telemetry.core import possible_browser
from telemetry.core.backends.chrome import cros_interface
from telemetry.core.backends.chrome import desktop_browser_backend
-from telemetry.core.platform import factory
+from telemetry.core import platform as platform_module
from telemetry.util import path
ALL_BROWSER_TYPES = [
@@ -28,6 +28,7 @@ ALL_BROWSER_TYPES = [
'content-shell-release_x64',
'system']
+
class PossibleDesktopBrowser(possible_browser.PossibleBrowser):
"""A desktop browser that can be controlled."""
@@ -48,9 +49,11 @@ class PossibleDesktopBrowser(possible_browser.PossibleBrowser):
return 'PossibleDesktopBrowser(browser_type=%s, executable=%s)' % (
self.browser_type, self._local_executable)
- @property
- def _platform_backend(self):
- return factory.GetPlatformBackendForCurrentOS()
+ def _InitPlatformIfNeeded(self):
+ if self._platform:
+ return
+ self._platform = platform_module.GetHostPlatform()
+
def Create(self):
if self._flash_path and not os.path.exists(self._flash_path):
@@ -60,12 +63,14 @@ class PossibleDesktopBrowser(possible_browser.PossibleBrowser):
self._flash_path)
self._flash_path = None
+ self._InitPlatformIfNeeded()
+
backend = desktop_browser_backend.DesktopBrowserBackend(
self.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)
- return browser.Browser(backend, self._platform_backend)
+ return browser.Browser(backend, self._platform)
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