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

tools/telemetry/telemetry/wpr_server.py

Index: tools/telemetry/telemetry/wpr_server.py
diff --git a/tools/telemetry/telemetry/wpr_server.py b/tools/telemetry/telemetry/wpr_server.py
index 6c202cf1def1e712a37afe59f2f05d49ebd2c3be..3a3bc00ce91b58c62350226a14235c4a66be069f 100644
--- a/tools/telemetry/telemetry/wpr_server.py
+++ b/tools/telemetry/telemetry/wpr_server.py
@@ -19,22 +19,23 @@ def GetChromeFlags(replay_host, http_port, https_port):
 
 class ReplayServer(object):
   def __init__(self, browser_backend, path, is_record_mode, webpagereplay_host,
-               webpagereplay_http_port, webpagereplay_https_port):
+               webpagereplay_local_http_port, webpagereplay_local_https_port,
+               webpagereplay_remote_http_port, webpagereplay_remote_https_port):
     self._browser_backend = browser_backend
     self._forwarder = None
     self._web_page_replay = None
     self._is_record_mode = is_record_mode
     self._webpagereplay_host = webpagereplay_host
-    self._webpagereplay_http_port = webpagereplay_http_port
-    self._webpagereplay_https_port = webpagereplay_https_port
+    self._webpagereplay_local_http_port = webpagereplay_local_http_port
+    self._webpagereplay_local_https_port = webpagereplay_local_https_port
+    self._webpagereplay_remote_http_port = webpagereplay_remote_http_port
+    self._webpagereplay_remote_https_port = webpagereplay_remote_https_port
 
-    # Note: This can cause flake if server doesn't shut down properly and keeps
-    # ports tied up. See crbug.com/157459.
     self._forwarder = browser_backend.CreateForwarder(
-        util.PortPair(self._webpagereplay_http_port,
-                      self._webpagereplay_http_port),
-        util.PortPair(self._webpagereplay_https_port,
-                      self._webpagereplay_https_port))
+        util.PortPair(self._webpagereplay_local_http_port,
+                      self._webpagereplay_remote_http_port),
+        util.PortPair(self._webpagereplay_local_https_port,
+                      self._webpagereplay_remote_https_port))
 
     options = []
     if self._is_record_mode:
@@ -44,8 +45,8 @@ class ReplayServer(object):
     self._web_page_replay = webpagereplay.ReplayServer(
         path,
         self._webpagereplay_host,
-        self._webpagereplay_http_port,
-        self._webpagereplay_https_port,
+        self._webpagereplay_local_http_port,
+        self._webpagereplay_local_https_port,
         options)
     self._web_page_replay.StartServer()