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

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

Issue 647193002: Adding App, AndroidApp, AppBackend, AndroidAppBackend, PossibleApp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/browser.py
diff --git a/tools/telemetry/telemetry/core/browser.py b/tools/telemetry/telemetry/core/browser.py
index 600e26c96156389443e1ec3964eb1092f6fa6c78..0b24a0e5b6506eed80248ed10afe8c94180f4ac2 100644
--- a/tools/telemetry/telemetry/core/browser.py
+++ b/tools/telemetry/telemetry/core/browser.py
@@ -5,6 +5,7 @@
import os
from telemetry import decorators
+from telemetry.core import app
from telemetry.core import browser_credentials
from telemetry.core import exceptions
from telemetry.core import extension_dict
@@ -16,7 +17,7 @@ from telemetry.core import wpr_server
from telemetry.core.backends import browser_backend
-class Browser(object):
+class Browser(app.App):
"""A running browser instance that can be controlled in a limited way.
To create a browser instance, use browser_finder.FindBrowser.
@@ -30,8 +31,8 @@ class Browser(object):
def __init__(self, backend, platform_backend, archive_path,
append_to_existing_wpr, make_javascript_deterministic,
credentials_path):
- assert platform_backend.platform != None
-
+ super(Browser, self).__init__(app_backend=backend,
+ platform_backend=platform_backend)
self._browser_backend = backend
self._platform_backend = platform_backend
self._wpr_server = None
@@ -67,10 +68,6 @@ class Browser(object):
self.Close()
@property
- def platform(self):
- return self._platform_backend.platform
-
- @property
def browser_type(self):
return self._browser_backend.browser_type

Powered by Google App Engine
This is Rietveld 408576698