Move chrome_proxy tests from under tools/perf to tools/chrome_proxy/integration_tests.

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
 # 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):
   pass
 
 
 class HTTPResponse(object):
   """ Represents an HTTP response from a timeline event."""
   def __init__(self, event):
     self._response = (
@@ skipping 133 matching lines @@
 
       resource = resp.response.url
       resource_signature = resp.url_signature
       cl = resp.content_length
       if resp.has_original_content_length:
         ocl = resp.original_content_length
         if ocl < cl:
           logging.warning('original content length (%d) is less than content '
                         'lenght(%d) for resource %s', ocl, cl, resource)
         if self.add_result_for_resource:
-          results.AddValue(scalar.ScalarValue(
-              results.current_page,
-              'resource_data_saving_' + resource_signature, 'percent',
-              resp.data_saving_rate * 100))
-          results.AddValue(scalar.ScalarValue(
-              results.current_page,
-              'resource_original_content_length_' + resource_signature, 'bytes',
-              ocl))
+          results.Add('resource_data_saving_' + resource_signature,
+                      'percent', resp.data_saving_rate * 100)
+          results.Add('resource_original_content_length_' + resource_signature,
+                      'bytes', ocl)
         original_content_length += ocl
       else:
         original_content_length += cl
       if self.add_result_for_resource:
-        results.AddValue(scalar.ScalarValue(
-            results.current_page,
-            'resource_content_length_' + resource_signature, 'bytes', cl))
+        results.Add(
+            'resource_content_length_' + resource_signature, 'bytes', cl)
       content_length += cl
 
-    results.AddValue(scalar.ScalarValue(
-        results.current_page, 'content_length', 'bytes', content_length))
-    results.AddValue(scalar.ScalarValue(
-        results.current_page, 'original_content_length', 'bytes',
-        original_content_length))
+    results.Add('content_length', 'bytes', content_length)
+    results.Add('original_content_length', 'bytes', original_content_length)
     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))
+        results.Add('data_saving', 'percent', saving)
       else:
-        results.AddValue(scalar.ScalarValue(
-            results.current_page, 'data_saving', 'percent', 0.0))
+        results.Add('data_saving', 'percent', 0.0)