Merge PageMeasurement to PageTest, move MeasurementFailure to

page_test.py.

Fixed all files that refer to MeasurementFailure in this patch. Rest of
subclasses of PageMeasurement will be fixed in a follow up patch.

BUG=383635

Review URL: https://codereview.chromium.org/434443003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287703 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 9 deletions

diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py b/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py
index 2471e87c..1110709 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]:
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_metrics.py b/tools/chrome_proxy/integration_tests/chrome_proxy_metrics.py
index 0a7c0709..fd26a2d 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_metrics.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_metrics.py
@@ -7,11 +7,11 @@ import logging
 import os
 
 from integration_tests import network_metrics
-from telemetry.page import page_measurement
+from telemetry.page import page_test
 from telemetry.value import scalar
 
 
-class ChromeProxyMetricException(page_measurement.MeasurementFailure):
+class ChromeProxyMetricException(page_test.MeasurementFailure):
   pass
 
 
diff --git a/tools/chrome_proxy/integration_tests/network_metrics.py b/tools/chrome_proxy/integration_tests/network_metrics.py
index 8556449..b83abb0 100644
--- a/tools/chrome_proxy/integration_tests/network_metrics.py
+++ b/tools/chrome_proxy/integration_tests/network_metrics.py
@@ -10,14 +10,14 @@ import logging
 import zlib
 
 from metrics import Metric
-from telemetry.page import page_measurement
+from telemetry.page import page_test
 # All network metrics are Chrome only for now.
 from telemetry.core.backends.chrome import inspector_network
 from telemetry.timeline import recording_options
 from telemetry.value import scalar
 
 
-class NetworkMetricException(page_measurement.MeasurementFailure):
+class NetworkMetricException(page_test.MeasurementFailure):
   pass