[Telemetry] Move from telemetry WaitFor to py_utils WaitFor

telemetry/telemetry/internal/util/wpr_server.py

Index: telemetry/telemetry/internal/util/wpr_server.py
diff --git a/telemetry/telemetry/internal/util/wpr_server.py b/telemetry/telemetry/internal/util/wpr_server.py
index 7f9343f01d41d35eaa092a1ec7439fc0e9e820f7..7733812d91dda28e93f3fffc0dc4be9d57b5de5d 100644
--- a/telemetry/telemetry/internal/util/wpr_server.py
+++ b/telemetry/telemetry/internal/util/wpr_server.py
@@ -14,10 +14,11 @@ import sys
 import tempfile
 import urllib
 
-from telemetry.core import exceptions
 from telemetry.core import util
 from telemetry.internal import forwarders
 
+import py_utils
+
 _REPLAY_DIR = os.path.join(
     util.GetTelemetryThirdPartyDir(), 'web-page-replay')
 
@@ -214,14 +215,14 @@ class ReplayServer(object):
           self._cmd_line, stdout=log_fh, stderr=subprocess.STDOUT,
           preexec_fn=(_ResetInterruptHandler if is_posix else None))
     try:
-      util.WaitFor(self._IsStarted, 30)
+      py_utils.WaitFor(self._IsStarted, 30)
       atexit_with_log.Register(self.StopServer)
       return forwarders.PortSet(
           self._started_ports['http'],
           self._started_ports['https'],
           self._started_ports.get('dns'),  # None if unused
           )
-    except exceptions.TimeoutException:
+    except py_utils.TimeoutException:
       raise ReplayNotStartedError(
           'Web Page Replay failed to start. Log output:\n%s' %
           ''.join(self._LogLines()))
@@ -250,8 +251,8 @@ class ReplayServer(object):
       pass
 
     try:
-      util.WaitFor(lambda: self.replay_process.poll() is not None, 10)
-    except exceptions.TimeoutException:
+      py_utils.WaitFor(lambda: self.replay_process.poll() is not None, 10)
+    except py_utils.TimeoutException:
       try:
         # Use a SIGINT so that it can do graceful cleanup.
         self.replay_process.send_signal(signal.SIGINT)