Kill page_test.NavigateToPage

tools/chrome_proxy/common/chrome_proxy_measurements.py

Index: tools/chrome_proxy/common/chrome_proxy_measurements.py
diff --git a/tools/chrome_proxy/common/chrome_proxy_measurements.py b/tools/chrome_proxy/common/chrome_proxy_measurements.py
index ab8fd671a5e8897becdf4d91d088673dc910de3a..1e14d3719bc1d6dd281991580e630bbfe7d47048 100644
--- a/tools/chrome_proxy/common/chrome_proxy_measurements.py
+++ b/tools/chrome_proxy/common/chrome_proxy_measurements.py
@@ -19,8 +19,6 @@ class ChromeProxyValidation(page_test.PageTest):
         needs_browser_restart_after_each_page=restart_after_each_page)
     self._metrics = metrics
     self._page = None
-    # Whether a timeout exception is expected during the test.
-    self._expect_timeout = False
 
   def CustomizeBrowserOptions(self, options):
     # Enable the chrome proxy (data reduction proxy).
@@ -49,17 +47,3 @@ class ChromeProxyValidation(page_test.PageTest):
     if hasattr(page, 'restart_after') and page.restart_after:
       return True
     return False
-
-  def RunNavigateSteps(self, page, tab):
-    # The redirect from safebrowsing causes a timeout. Ignore that.
-    try:
-      super(ChromeProxyValidation, self).RunNavigateSteps(page, tab)
-      if self._expect_timeout:
-        raise metrics.ChromeProxyMetricException, (
-            'Timeout was expected, but did not occur')
-    except exceptions.TimeoutException as e:
-      if self._expect_timeout:
-        logging.warning('Navigation timeout on page %s',
-                        page.name if page.name else page.url)
-      else:
-        raise e