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

telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py

Index: telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py
diff --git a/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py b/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py
index 37e083513be28a203c0473175ba2d6275dc5281b..575d298846c5be5d3a81ab8e36c3eec848d72227 100644
--- a/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py
+++ b/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend_unittest.py
@@ -12,16 +12,16 @@
 
 
 class FakePlatformBackend(object):
-  def __init__(self, is_replay_active, wpr_http_device_port,
-               wpr_https_device_port, is_host_platform):
+  def __init__(self, is_replay_active, local_ts_proxy_port, remote_port,
+               is_host_platform):
     self.is_host_platform = is_host_platform
 
     self.forwarder_factory = mock.Mock()
 
     self.network_controller_backend = mock.Mock()
     self.network_controller_backend.is_replay_active = is_replay_active
-    self.network_controller_backend.wpr_device_ports = forwarders.PortSet(
-        http=wpr_http_device_port, https=wpr_https_device_port, dns=None)
+    self.network_controller_backend.forwarder.port_pair = forwarders.PortPair(
+        local_port=local_ts_proxy_port, remote_port=remote_port)
     self.network_controller_backend.host_ip = '127.0.0.1'
     self.network_controller_backend.is_test_ca_installed = False
 
@@ -42,14 +42,15 @@
   # pylint: disable=abstract-method
 
   def __init__(self, browser_options,
-               wpr_http_device_port=None, wpr_https_device_port=None,
+               local_ts_proxy_port=None,
+               remote_port=None,
                is_running_locally=False):
     browser_options.extensions_to_load = []
     browser_options.output_profile_path = None
     super(TestChromeBrowserBackend, self).__init__(
         platform_backend=FakePlatformBackend(
             browser_options.wpr_mode != wpr_modes.WPR_OFF,
-            wpr_http_device_port, wpr_https_device_port, is_running_locally),
+            local_ts_proxy_port, remote_port, is_running_locally),
         supports_tab_control=False,
         supports_extensions=False,
         browser_options=browser_options)
@@ -67,14 +68,12 @@
     browser_options = FakeBrowserOptions(wpr_mode=wpr_modes.WPR_REPLAY)
     browser_backend = TestChromeBrowserBackend(
         browser_options,
-        wpr_http_device_port=456,
-        wpr_https_device_port=567,
+        local_ts_proxy_port=567,
+        remote_port=789,
         is_running_locally=is_running_locally)
     expected_args = [
-        '--host-resolver-rules=MAP * 127.0.0.1,EXCLUDE localhost',
         '--ignore-certificate-errors',
-        '--testing-fixed-http-port=456',
-        '--testing-fixed-https-port=567'
+        '--proxy-server=socks://localhost:789',
         ]
     self.assertEqual(
         expected_args,