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

Unified Diff: tools/telemetry/telemetry/core/browser.py

Issue 436873003: Make telemetry platform a singleton (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase_again Created 6 years, 4 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/browser.py
diff --git a/tools/telemetry/telemetry/core/browser.py b/tools/telemetry/telemetry/core/browser.py
index 6a3c6ca0fa1f177e0ba5b8520523884139d89aa7..2c3d57d97b0a4873dad8958717634e20aa8b9fc6 100644
--- a/tools/telemetry/telemetry/core/browser.py
+++ b/tools/telemetry/telemetry/core/browser.py
@@ -10,7 +10,6 @@ from telemetry.core import exceptions
from telemetry.core import extension_dict
from telemetry.core import local_server
from telemetry.core import memory_cache_http_server
-from telemetry.core import platform
from telemetry.core import tab_list
from telemetry.core import wpr_modes
from telemetry.core import wpr_server
@@ -30,17 +29,19 @@ class Browser(object):
... do all your operations on browser here
"""
def __init__(self, backend, platform_backend):
+ assert platform_backend.platform != None
+
self._browser_backend = backend
+ self._platform_backend = platform_backend
self._http_server = None
self._wpr_server = None
- self._platform_backend = platform_backend
- self._platform = platform.Platform(platform_backend)
self._active_profilers = []
self._profilers_states = {}
self._local_server_controller = local_server.LocalServerController(backend)
self._tabs = tab_list.TabList(backend.tab_list_backend)
self.credentials = browser_credentials.BrowserCredentials()
- self._platform.SetFullPerformanceModeEnabled(True)
+
+ self.platform.SetFullPerformanceModeEnabled(True)
def __enter__(self):
self.Start()
@@ -51,7 +52,7 @@ class Browser(object):
@property
def platform(self):
- return self._platform
+ return self._platform_backend.platform
@property
def browser_type(self):

Powered by Google App Engine
This is Rietveld 408576698