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

telemetry/telemetry/internal/platform/cros_platform_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
 
 from telemetry import decorators
 from telemetry.core import cros_interface
 from telemetry.core import platform
 from telemetry.core import util
-from telemetry.internal import forwarders
 from telemetry.internal.forwarders import cros_forwarder
 from telemetry.internal.platform import cros_device
 from telemetry.internal.platform import linux_based_platform_backend
 from telemetry.internal.platform.power_monitor import cros_power_monitor
 from telemetry.internal.util import ps_util
 
 
 class CrosPlatformBackend(
     linux_based_platform_backend.LinuxBasedPlatformBackend):
   def __init__(self, device=None):
@@ skipping 27 matching lines @@
   def forwarder_factory(self):
     if not self._forwarder_factory:
       self._forwarder_factory = cros_forwarder.CrOsForwarderFactory(self._cri)
     return self._forwarder_factory
 
   def GetRemotePort(self, port):
     if self._cri.local:
       return port
     return self._cri.GetRemotePort()
 
-  def GetWprPortPairs(self):
-    """Return suitable port pairs to be used for web page replay."""
-    default_local_ports = super(CrosPlatformBackend, self).GetWprPortPairs(
-        ).local_ports
-    return forwarders.PortPairs.Zip(
-        default_local_ports,
-        forwarders.PortSet(
-          http=self.GetRemotePort(default_local_ports.http),
-          https=self.GetRemotePort(default_local_ports.https),
-          dns=None))
-
   def IsThermallyThrottled(self):
     raise NotImplementedError()
 
   def HasBeenThermallyThrottled(self):
     raise NotImplementedError()
 
   def RunCommand(self, args):
     if not isinstance(args, list):
       args = [args]
     stdout, stderr = self._cri.RunCmdOnDevice(args)
@@ skipping 90 matching lines @@
       logging.warning(
           'PathExists: params timeout and retries are not support on CrOS.')
     return self._cri.FileExistsOnDevice(path)
 
   def CanTakeScreenshot(self):
     # crbug.com/609001: screenshots don't work on VMs.
     return not self.cri.IsRunningOnVM()
 
   def TakeScreenshot(self, file_path):
     return self._cri.TakeScreenshot(file_path)