Merge PageMeasurement to PageTest.

tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py

Index: tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py b/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py
index 2471e87cf2a43bc34ea16c704c85d35b36029ff0..111070971b4c0227ff8d4abf0059e809cf658d6a 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py
@@ -9,10 +9,10 @@ import urlparse
 from integration_tests import chrome_proxy_metrics as metrics
 from metrics import loading
 from telemetry.core import util
-from telemetry.page import page_measurement
+from telemetry.page import page_test
 
 
-class ChromeProxyLatency(page_measurement.PageMeasurement):
+class ChromeProxyLatency(page_test.PageTest):
   """Chrome proxy latency measurement."""
 
   def __init__(self, *args, **kwargs):
@@ -27,7 +27,7 @@ class ChromeProxyLatency(page_measurement.PageMeasurement):
     loading.LoadingMetric().AddResults(tab, results)
 
 
-class ChromeProxyDataSaving(page_measurement.PageMeasurement):
+class ChromeProxyDataSaving(page_test.PageTest):
   """Chrome proxy data daving measurement."""
   def __init__(self, *args, **kwargs):
     super(ChromeProxyDataSaving, self).__init__(*args, **kwargs)
@@ -44,7 +44,7 @@ class ChromeProxyDataSaving(page_measurement.PageMeasurement):
     self._metrics.AddResultsForDataSaving(tab, results)
 
 
-class ChromeProxyValidation(page_measurement.PageMeasurement):
+class ChromeProxyValidation(page_test.PageTest):
   """Base class for all chrome proxy correctness measurements."""
 
   def __init__(self, restart_after_each_page=False):
@@ -245,7 +245,7 @@ class ChromeProxySmoke(ChromeProxyValidation):
         'safebrowsing': [self._metrics.AddResultsForSafebrowsing],
         }
     if not self._page.name in page_to_metrics:
-      raise page_measurement.MeasurementFailure(
+      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]: