Reland of "[telemetry] Wire TsProxy through telemetry's network stack."

telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py

Index: telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
diff --git a/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py b/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
index 9c24f4c2cf918d49383ccdcd924de94aa112fa51..cafd4b7f41dc6a519139a0a4a9f1cbe60dbbab0b 100644
--- a/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
+++ b/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
@@ -121,16 +121,24 @@
     return args
 
   def GetReplayBrowserStartupArgs(self):
-    replay_args = []
     network_backend = self.platform_backend.network_controller_backend
-    proxy_port = network_backend.forwarder.port_pair.remote_port
-    replay_args.append('--proxy-server=socks://localhost:%s' % proxy_port)
     if not network_backend.is_replay_active:
       return []
+    replay_args = []
     if not network_backend.is_test_ca_installed:
       # Ignore certificate errors if the platform backend has not created
       # and installed a root certificate.
       replay_args.append('--ignore-certificate-errors')
+    # Force hostnames to resolve to the replay's host_ip.
+    replay_args.append('--host-resolver-rules=MAP * %s,EXCLUDE localhost' %
+                         network_backend.host_ip)
+    # Force the browser to send HTTP/HTTPS requests to fixed ports if they
+    # are not the standard HTTP/HTTPS ports.
+    device_ports = network_backend.wpr_device_ports
+    if device_ports.http != 80:
+      replay_args.append('--testing-fixed-http-port=%s' % device_ports.http)
+    if device_ports.https != 443:
+      replay_args.append('--testing-fixed-https-port=%s' % device_ports.https)
     return replay_args
 
   def HasBrowserFinishedLaunching(self):