[NOT FOR COMMIT] Revert Disable TsProxy on Android

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

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import pprint
 import shlex
 import sys
 
 from telemetry.core import exceptions
@@ skipping 107 matching lines @@
           self.browser_options.VERBOSE_LOGGING):
       args.extend(['--enable-logging', '--v=1'])
 
     return args
 
   def GetReplayBrowserStartupArgs(self):
     replay_args = []
     network_backend = self.platform_backend.network_controller_backend
     if not network_backend.is_initialized:
       return []
-    proxy_port = network_backend.forwarder.port_pair.remote_port
-    replay_args.append('--proxy-server=socks://localhost:%s' % proxy_port)
     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')
+
+    replay_args.append('--host-resolver-rules=MAP * %s,EXCLUDE localhost' %
+                       network_backend.host_ip)
+    http = network_backend._wpr_http.remote_port
+    https = network_backend._wpr_https.remote_port
+    replay_args.append('--testing-fixed-http-port=%s' % http)
+    replay_args.append('--testing-fixed-https-port=%s' % https)
     return replay_args
 
   def HasBrowserFinishedLaunching(self):
     assert self._port, 'No DevTools port info available.'
     return devtools_client_backend.IsDevToolsAgentAvailable(self._port, self)
 
   def _InitDevtoolsClientBackend(self, remote_devtools_port=None):
     """ Initiate the devtool client backend which allow browser connection
     through browser' devtool.
 
@@ skipping 156 matching lines @@
   def supports_cpu_metrics(self):
     return True
 
   @property
   def supports_memory_metrics(self):
     return True
 
   @property
   def supports_power_metrics(self):
     return True