Merge PageMeasurement to PageTest.

tools/chrome_proxy/integration_tests/network_metrics.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 gzip
 import hashlib
 import io
 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
 
 
 class HTTPResponse(object):
   """ Represents an HTTP response from a timeline event."""
   def __init__(self, event):
     self._response = (
         inspector_network.InspectorNetworkResponseData.FromTimelineEvent(event))
     self._content_length = None
 
@@ skipping 162 matching lines @@
     if self.compute_data_saving:
       if (original_content_length > 0 and
           original_content_length >= content_length):
         saving = (float(original_content_length-content_length) * 100 /
                   original_content_length)
         results.AddValue(scalar.ScalarValue(
             results.current_page, 'data_saving', 'percent', saving))
       else:
         results.AddValue(scalar.ScalarValue(
             results.current_page, 'data_saving', 'percent', 0.0))