Remove page_measurement_results.

tools/chrome_proxy/integration_tests/chrome_proxy_metrics_unittest.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 unittest
 
 from integration_tests import chrome_proxy_metrics as metrics
 from integration_tests import network_metrics_unittest as network_unittest
-from metrics import test_page_measurement_results
+from metrics import test_page_test_results
 
 
 # Timeline events used in tests.
 # An HTML not via proxy.
 EVENT_HTML_PROXY = network_unittest.NetworkMetricTest.MakeNetworkTimelineEvent(
     url='http://test.html1',
     response_headers={
         'Content-Type': 'text/html',
         'Content-Length': str(len(network_unittest.HTML_BODY)),
         },
@@ skipping 93 matching lines @@
   def testChromeProxyMetricForDataSaving(self):
     metric = metrics.ChromeProxyMetric()
     events = [
         EVENT_HTML_PROXY,
         EVENT_HTML_PROXY_DEPRECATED_VIA,
         EVENT_IMAGE_PROXY_CACHED,
         EVENT_IMAGE_DIRECT]
     metric.SetEvents(events)
 
     self.assertTrue(len(events), len(list(metric.IterResponses(None))))
-    results = test_page_measurement_results.TestPageMeasurementResults(self)
+    results = test_page_test_results.TestPageTestResults(self)
 
     metric.AddResultsForDataSaving(None, results)
     results.AssertHasPageSpecificScalarValue('resources_via_proxy', 'count', 2)
     results.AssertHasPageSpecificScalarValue('resources_from_cache', 'count', 1)
     results.AssertHasPageSpecificScalarValue('resources_direct', 'count', 2)
 
   def testChromeProxyMetricForHeaderValidation(self):
     metric = metrics.ChromeProxyMetric()
     metric.SetEvents([
         EVENT_HTML_PROXY,
         EVENT_HTML_PROXY_DEPRECATED_VIA,
         EVENT_IMAGE_PROXY_CACHED,
         EVENT_IMAGE_DIRECT])
 
-    results = test_page_measurement_results.TestPageMeasurementResults(self)
+    results = test_page_test_results.TestPageTestResults(self)
 
     missing_via_exception = False
     try:
       metric.AddResultsForHeaderValidation(None, results)
     except metrics.ChromeProxyMetricException:
       missing_via_exception = True
     # Only the HTTP image response does not have a valid Via header.
     self.assertTrue(missing_via_exception)
 
     # Two events with valid Via headers.
     metric.SetEvents([
         EVENT_HTML_PROXY_DEPRECATED_VIA,
         EVENT_IMAGE_PROXY_CACHED])
     metric.AddResultsForHeaderValidation(None, results)
     results.AssertHasPageSpecificScalarValue('checked_via_header', 'count', 2)
 
   def testChromeProxyMetricForBypass(self):
     metric = metrics.ChromeProxyMetric()
     metric.SetEvents([
         EVENT_HTML_PROXY,
         EVENT_HTML_PROXY_DEPRECATED_VIA,
         EVENT_IMAGE_PROXY_CACHED,
         EVENT_IMAGE_DIRECT])
-    results = test_page_measurement_results.TestPageMeasurementResults(self)
+    results = test_page_test_results.TestPageTestResults(self)
 
     bypass_exception = False
     try:
       metric.AddResultsForBypass(None, results)
     except metrics.ChromeProxyMetricException:
       bypass_exception = True
     # Two of the first three events have Via headers.
     self.assertTrue(bypass_exception)
 
     # Use directly fetched image only. It is treated as bypassed.
     metric.SetEvents([EVENT_IMAGE_DIRECT])
     metric.AddResultsForBypass(None, results)
     results.AssertHasPageSpecificScalarValue('bypass', 'count', 1)
 
   def testChromeProxyMetricForHTTPFallback(self):
     metric = metrics.ChromeProxyMetric()
     metric.SetEvents([
         EVENT_HTML_PROXY,
         EVENT_HTML_PROXY_DEPRECATED_VIA])
-    results = test_page_measurement_results.TestPageMeasurementResults(self)
+    results = test_page_test_results.TestPageTestResults(self)
 
     fallback_exception = False
     info = {}
     info['enabled'] = False
     self._StubGetProxyInfo(info)
     try:
       metric.AddResultsForBypass(None, results)
     except metrics.ChromeProxyMetricException:
       fallback_exception = True
     self.assertTrue(fallback_exception)
@@ skipping 15 matching lines @@
     info['proxies'] = [
         metrics.PROXY_SETTING_HTTP,
         metrics.PROXY_SETTING_DIRECT
         ]
     self._StubGetProxyInfo(info)
     metric.AddResultsForHTTPFallback(None, results)
 
   def testChromeProxyMetricForSafebrowsing(self):
     metric = metrics.ChromeProxyMetric()
     metric.SetEvents([EVENT_MALWARE_PROXY])
-    results = test_page_measurement_results.TestPageMeasurementResults(self)
+    results = test_page_test_results.TestPageTestResults(self)
 
     metric.AddResultsForSafebrowsing(None, results)
     results.AssertHasPageSpecificScalarValue('safebrowsing', 'boolean', True)
 
     # Clear results and metrics to test no response for safebrowsing
-    results = test_page_measurement_results.TestPageMeasurementResults(self)
+    results = test_page_test_results.TestPageTestResults(self)
     metric.SetEvents([])
     metric.AddResultsForSafebrowsing(None, results)
     results.AssertHasPageSpecificScalarValue('safebrowsing', 'boolean', True)