Index: tools/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py |
diff --git a/tools/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py b/tools/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py |
index 845f84939b8d52e19551acf68f7ee1712e2284f0..8397d31ff320f9f84def3b191975eb8dddcb3d33 100644 |
--- a/tools/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py |
+++ b/tools/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py |
@@ -17,7 +17,6 @@ from telemetry.internal.backends.chrome import tab_list_backend |
from telemetry.internal.backends.chrome_inspector import devtools_client_backend |
from telemetry.internal.browser import user_agent |
from telemetry.internal.browser import web_contents |
-from telemetry.internal import forwarders |
from telemetry.testing import options_for_unittests |
from telemetry.util import wpr_modes |
@@ -44,17 +43,6 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend): |
self._output_profile_path = output_profile_path |
self._extensions_to_load = extensions_to_load |
- if browser_options.netsim: |
- self.wpr_port_pairs = forwarders.PortPairs( |
- http=forwarders.PortPair(80, 80), |
- https=forwarders.PortPair(443, 443), |
- dns=forwarders.PortPair(53, 53)) |
- else: |
- self.wpr_port_pairs = forwarders.PortPairs( |
- http=forwarders.PortPair(0, 0), |
- https=forwarders.PortPair(0, 0), |
- dns=None) |
- |
if (self.browser_options.dont_override_profile and |
not options_for_unittests.AreSet()): |
sys.stderr.write('Warning: Not overriding profile. This can cause ' |
@@ -150,7 +138,8 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend): |
return True |
def GetReplayBrowserStartupArgs(self): |
- if self.browser_options.wpr_mode == wpr_modes.WPR_OFF: |
+ network_backend = self.platform_backend.network_controller_backend |
+ if network_backend.wpr_mode == wpr_modes.WPR_OFF: |
return [] |
replay_args = [] |
if self.should_ignore_certificate_errors: |
@@ -160,11 +149,10 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend): |
if self._UseHostResolverRules(): |
# Force hostnames to resolve to the replay's host_ip. |
replay_args.append('--host-resolver-rules=MAP * %s,EXCLUDE localhost' % |
- self._platform_backend.forwarder_factory.host_ip) |
+ network_backend.host_ip) |
# Force the browser to send HTTP/HTTPS requests to fixed ports if they |
# are not the standard HTTP/HTTPS ports. |
- http_port = self.platform_backend.wpr_http_device_port |
- https_port = self.platform_backend.wpr_https_device_port |
+ http_port, https_port, _ = network_backend.wpr_device_ports |
if http_port != 80: |
replay_args.append('--testing-fixed-http-port=%s' % http_port) |
if https_port != 443: |