Kill page_test.NavigateToPage

tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py

 # Copyright 2014 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 base64
 import logging
 import urlparse
 
 from common.chrome_proxy_measurements import ChromeProxyValidation
 from integration_tests import chrome_proxy_metrics as metrics
@@ skipping 95 matching lines @@
     self._metrics.AddResultsForBlockOnce(tab, results)
 
 
 class ChromeProxySafebrowsingOn(ChromeProxyValidation):
   """Correctness measurement for safebrowsing."""
 
   def __init__(self):
     super(ChromeProxySafebrowsingOn, self).__init__(
         metrics=metrics.ChromeProxyMetric())
 
-  def WillNavigateToPage(self, page, tab):
-    super(ChromeProxySafebrowsingOn, self).WillNavigateToPage(page, tab)
-    self._expect_timeout = True
-
   def AddResults(self, tab, results):
     self._metrics.AddResultsForSafebrowsingOn(tab, results)
 
 class ChromeProxySafebrowsingOff(ChromeProxyValidation):
   """Correctness measurement for safebrowsing."""
 
   def __init__(self):
     super(ChromeProxySafebrowsingOff, self).__init__(
         metrics=metrics.ChromeProxyMetric())
 
@@ skipping 239 matching lines @@
             self._metrics.AddResultsForDataSaving,
             ],
         'bypass': [self._metrics.AddResultsForBypass],
         }
     if not self._page.name in page_to_metrics:
       raise page_test.MeasurementFailure(
           'Invalid page name (%s) in smoke. Page name must be one of:\n%s' % (
           self._page.name, page_to_metrics.keys()))
     for add_result in page_to_metrics[self._page.name]:
       add_result(tab, results)