[telemetry] Removing flake in wpr_server.py caused by static port assignment from chrome/test/funct…

tools/telemetry/telemetry/cros_browser_backend.py

Index: tools/telemetry/telemetry/cros_browser_backend.py
diff --git a/tools/telemetry/telemetry/cros_browser_backend.py b/tools/telemetry/telemetry/cros_browser_backend.py
index b2eea47f5477c386bf483d1d4f00963576c01177..bdb73fc875c28667b0f335814ae047ce460b25e8 100644
--- a/tools/telemetry/telemetry/cros_browser_backend.py
+++ b/tools/telemetry/telemetry/cros_browser_backend.py
@@ -70,6 +70,9 @@ class CrOSBrowserBackend(browser_backend.BrowserBackend):
     logging.info('Browser is up!')
 
   def GetBrowserStartupArgs(self):
+    self.webpagereplay_remote_http_port = self._cri.GetRemotePort()
+    self.webpagereplay_remote_https_port = self._cri.GetRemotePort()
+
     args = super(CrOSBrowserBackend, self).GetBrowserStartupArgs()
 
     args.extend([
@@ -86,6 +89,9 @@ class CrOSBrowserBackend(browser_backend.BrowserBackend):
 
     return args
 
+  def GetRemotePort(self, _):
+    return self._cri.GetRemotePort()
+
   def SetBrowser(self, browser):
     super(CrOSBrowserBackend, self).SetBrowser(browser)
 
@@ -183,29 +189,20 @@ class SSHForwarder(object):
   def __init__(self, cri, forwarding_flag, *port_pairs):
     self._proc = None
 
-    new_port_pairs = []
-
-    for port_pair in port_pairs:
-      if port_pair.remote_port is None:
-        new_port_pairs.append(
-            util.PortPair(port_pair.local_port, cri.GetRemotePort()))
-      else:
-        new_port_pairs.append(port_pair)
-
     if forwarding_flag == 'R':
-      self._host_port = new_port_pairs[0].remote_port
+      self._host_port = port_pairs[0].remote_port
       command_line = ['-%s%i:localhost:%i' % (forwarding_flag,
                                               port_pair.remote_port,
                                               port_pair.local_port)
-                      for port_pair in new_port_pairs]
+                      for port_pair in port_pairs]
     else:
-      self._host_port = new_port_pairs[0].local_port
+      self._host_port = port_pairs[0].local_port
       command_line = ['-%s%i:localhost:%i' % (forwarding_flag,
                                               port_pair.local_port,
                                               port_pair.remote_port)
-                      for port_pair in new_port_pairs]
+                      for port_pair in port_pairs]
 
-    self._device_port = new_port_pairs[0].remote_port
+    self._device_port = port_pairs[0].remote_port
 
     self._proc = subprocess.Popen(
       cri.FormSSHCommandLine(['sleep', '999999999'], command_line),