LoFi integration test should use HasChromeProxyLoFi

tools/chrome_proxy/integration_tests/chrome_proxy_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 logging
 import time
 
 from integration_tests import network_metrics
 from telemetry.page import page_test
 from telemetry.value import scalar
@@ skipping 196 matching lines @@
 
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'via', 'count', via_count))
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'bypass', 'count', bypass_count))
 
   def AddResultsForLoFi(self, tab, results):
     lo_fi_count = 0
 
     for resp in self.IterResponses(tab):
-      if resp.HasChromeProxyViaHeader():
-        lo_fi_count += 1
-      else:
-        r = resp.response
-        raise ChromeProxyMetricException, (
-            '%s: LoFi not in request header.' % (r.url))
-
-      cl = resp.content_length
-      resource = resp.response.url
-    results.AddValue(scalar.ScalarValue(
-        results.current_page, 'lo_fi', 'count', lo_fi_count))
-
-    for resp in self.IterResponses(tab):
       r = resp.response
       cl = resp.content_length

[sclittle, 2015/03/24 17:32:46]

Just use resp.response.url and resp.content_length inline; these r and cl
variables aren't needed.

[megjablon, 2015/03/24 18:05:18]

Done.

-      ocl = resp.original_content_length
-      saving = resp.data_saving_rate * 100
+
+      if resp.HasChromeProxyLoFi():
+        lo_fi_count += 1
+      else:
+        raise ChromeProxyMetricException, (
+            '%s: LoFi not in request header.' % (r.url))
+
       if cl > 100:
         raise ChromeProxyMetricException, (
             'Image %s is %d bytes. Expecting less than 100 bytes.' %
-            (resource, cl))
+            (r.url, cl))
+
+    if lo_fi_count == 0:
+      raise ChromeProxyMetricException, (
+          'Expected at least one LoFi response, but zero such responses were '
+          'received.')
 
     results.AddValue(scalar.ScalarValue(
-        results.current_page, 'content_length', 'bytes', cl))
-    results.AddValue(scalar.ScalarValue(
-        results.current_page, 'original_content_length', 'bytes', ocl))
-    results.AddValue(scalar.ScalarValue(
-        results.current_page, 'data_saving', 'percent', saving))
+        results.current_page, 'lo_fi', 'count', lo_fi_count))
+    super(ChromeProxyMetric, self).AddResults(tab, results)
 
   def AddResultsForBypass(self, tab, results):
     bypass_count = 0
 
     for resp in self.IterResponses(tab):
       if resp.HasChromeProxyViaHeader():
         r = resp.response
         raise ChromeProxyMetricException, (
             '%s: Should not have Via header (%s) (refer=%s, status=%d)' % (
                 r.url, r.GetHeader('Via'), r.GetHeader('Referer'), r.status))
@@ skipping 237 matching lines @@
         via_count += 1
     if via_count == 0:
       raise ChromeProxyMetricException, (
           'Expected at least one response through the proxy after the bypass '
           'expired, but zero such responses were received.')
 
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'bypass', 'count', bypass_count))
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'via', 'count', via_count))