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

Unified Diff: tools/telemetry/telemetry/wpr_server.py

Issue 11740020: [telemetry] Removing globals from webpagereplay.py. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 12 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
« no previous file with comments | « tools/telemetry/telemetry/browser_backend.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/wpr_server.py
diff --git a/tools/telemetry/telemetry/wpr_server.py b/tools/telemetry/telemetry/wpr_server.py
index aa30a18255afc5dbf7d4cd1d0c437a703953f4a2..6c202cf1def1e712a37afe59f2f05d49ebd2c3be 100644
--- a/tools/telemetry/telemetry/wpr_server.py
+++ b/tools/telemetry/telemetry/wpr_server.py
@@ -14,29 +14,39 @@ sys.path.append(
'../../../chrome/test/functional')))
import webpagereplay # pylint: disable=F0401
-CHROME_FLAGS = webpagereplay.CHROME_FLAGS
+def GetChromeFlags(replay_host, http_port, https_port):
+ return webpagereplay.GetChromeFlags(replay_host, http_port, https_port)
class ReplayServer(object):
- def __init__(self, browser_backend, path, is_record_mode):
+ def __init__(self, browser_backend, path, is_record_mode, webpagereplay_host,
+ webpagereplay_http_port, webpagereplay_https_port):
self._browser_backend = browser_backend
self._forwarder = None
self._web_page_replay = None
self._is_record_mode = is_record_mode
+ self._webpagereplay_host = webpagereplay_host
+ self._webpagereplay_http_port = webpagereplay_http_port
+ self._webpagereplay_https_port = webpagereplay_https_port
# Note: This can cause flake if server doesn't shut down properly and keeps
# ports tied up. See crbug.com/157459.
self._forwarder = browser_backend.CreateForwarder(
- util.PortPair(webpagereplay.HTTP_PORT,
- webpagereplay.HTTP_PORT),
- util.PortPair(webpagereplay.HTTPS_PORT,
- webpagereplay.HTTPS_PORT))
+ util.PortPair(self._webpagereplay_http_port,
+ self._webpagereplay_http_port),
+ util.PortPair(self._webpagereplay_https_port,
+ self._webpagereplay_https_port))
options = []
if self._is_record_mode:
options.append('--record')
if not browser_backend.options.wpr_make_javascript_deterministic:
options.append('--inject_scripts=')
- self._web_page_replay = webpagereplay.ReplayServer(path, options)
+ self._web_page_replay = webpagereplay.ReplayServer(
+ path,
+ self._webpagereplay_host,
+ self._webpagereplay_http_port,
+ self._webpagereplay_https_port,
+ options)
self._web_page_replay.StartServer()
def __enter__(self):
« no previous file with comments | « tools/telemetry/telemetry/browser_backend.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698