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

Unified Diff: telemetry/telemetry/internal/platform/network_controller_backend.py

Issue 3016693002: Remove support for legacy wpr_server in Telemetry
Patch Set: Created 3 years, 3 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 | « telemetry/telemetry/core/network_controller.py ('k') | telemetry/telemetry/page/shared_page_state.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: telemetry/telemetry/internal/platform/network_controller_backend.py
diff --git a/telemetry/telemetry/internal/platform/network_controller_backend.py b/telemetry/telemetry/internal/platform/network_controller_backend.py
index c67d5e7223ce67c852df333ab2edf3b5cdab1cdb..8eb0798b73b778f8ce1ff8fdd6d50877def5f84c 100644
--- a/telemetry/telemetry/internal/platform/network_controller_backend.py
+++ b/telemetry/telemetry/internal/platform/network_controller_backend.py
@@ -4,7 +4,6 @@
import os
-from telemetry.internal.util import wpr_server
from telemetry.internal.util import webpagereplay_go_server
from telemetry.internal.util import ts_proxy_server
from telemetry.util import wpr_modes
@@ -31,7 +30,6 @@ class NetworkControllerBackend(object):
self._platform_backend = platform_backend
self._wpr_mode = None
self._extra_wpr_args = None
- self._use_wpr_go = False
self._archive_path = None
self._make_javascript_deterministic = None
self._forwarder = None
@@ -77,7 +75,7 @@ class NetworkControllerBackend(object):
except AttributeError:
return None
- def Open(self, wpr_mode, extra_wpr_args, use_wpr_go=False):
+ def Open(self, wpr_mode, extra_wpr_args):
"""Configure and prepare target platform for network control.
This may, e.g., install test certificates and perform any needed setup
@@ -94,7 +92,6 @@ class NetworkControllerBackend(object):
assert not self.is_open, 'Network controller is already open'
self._wpr_mode = wpr_mode
self._extra_wpr_args = extra_wpr_args
- self._use_wpr_go = use_wpr_go
def Close(self):
"""Undo changes in the target platform used for network control.
@@ -107,7 +104,6 @@ class NetworkControllerBackend(object):
self._make_javascript_deterministic = None
self._archive_path = None
self._extra_wpr_args = None
- self._use_wpr_go = False
self._wpr_mode = None
def StartReplay(self, archive_path, make_javascript_deterministic=False):
@@ -177,21 +173,12 @@ class NetworkControllerBackend(object):
def _StartReplayServer(self):
"""Start the replay server and return the started local_ports."""
self._StopReplayServer() # In case it was already running.
- if self._use_wpr_go:
- self._wpr_server = webpagereplay_go_server.ReplayServer(
- self._archive_path,
- self.host_ip,
- http_port=0,
- https_port=0,
- replay_options=self._ReplayCommandLineArgs())
- else:
- self._wpr_server = wpr_server.ReplayServer(
- self._archive_path,
- self.host_ip,
- http_port=0,
- https_port=0,
- dns_port=None,
- replay_options=self._ReplayCommandLineArgs())
+ self._wpr_server = webpagereplay_go_server.ReplayServer(
+ self._archive_path,
+ self.host_ip,
+ http_port=0,
+ https_port=0,
+ replay_options=self._ReplayCommandLineArgs())
return self._wpr_server.StartServer()
def _StopReplayServer(self):
« no previous file with comments | « telemetry/telemetry/core/network_controller.py ('k') | telemetry/telemetry/page/shared_page_state.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698