Fix unittests for Data Saver integration tests

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
 
 
 class ChromeProxyMetricException(page_test.MeasurementFailure):
   pass
 
 
 CHROME_PROXY_VIA_HEADER = 'Chrome-Compression-Proxy'
-CHROME_PROXY_VIA_HEADER_DEPRECATED = '1.1 Chrome Compression Proxy'
 
 
 class ChromeProxyResponse(network_metrics.HTTPResponse):
   """ Represents an HTTP response from a timeleine event."""
   def __init__(self, event):
     super(ChromeProxyResponse, self).__init__(event)
 
   def ShouldHaveChromeProxyViaHeader(self):
     resp = self.response
     # Ignore https and data url
     if resp.url.startswith('https') or resp.url.startswith('data:'):
       return False
     # Ignore 304 Not Modified and cache hit.
     if resp.status == 304 or resp.served_from_cache:
       return False
     # Ignore invalid responses that don't have any header. Log a warning.
     if not resp.headers:
       logging.warning('response for %s does not any have header '
                       '(refer=%s, status=%s)',
                       resp.url, resp.GetHeader('Referer'), resp.status)
       return False
     return True
 
   def HasChromeProxyViaHeader(self):
     via_header = self.response.GetHeader('Via')
     if not via_header:
       return False
     vias = [v.strip(' ') for v in via_header.split(',')]
-    # The Via header is valid if it is the old format or the new format
-    # with 4-character version prefix, for example,
-    # "1.1 Chrome-Compression-Proxy".
-    return (CHROME_PROXY_VIA_HEADER_DEPRECATED in vias or
-            any(v[4:] == CHROME_PROXY_VIA_HEADER for v in vias))
+    # The Via header is valid if it has a 4-character version prefix followed by
+    # the proxy name, for example, "1.1 Chrome-Compression-Proxy".
+    return any(v[4:] == CHROME_PROXY_VIA_HEADER for v in vias)
 
   def IsValidByViaHeader(self):
     return (not self.ShouldHaveChromeProxyViaHeader() or
             self.HasChromeProxyViaHeader())
 
   def GetChromeProxyClientType(self):
     """Get the client type directive from the Chrome-Proxy request header.
 
     Returns:
         The client type directive from the Chrome-Proxy request header for the
@@ skipping 254 matching lines @@
     # The first response(s) coming from fallback_response_host should be
     # through the HTTP fallback proxy.
     resp = next(responses, None)
     while resp and fallback_response_host in resp.response.url:
       if fallback_response_host in resp.response.url:
         if (not resp.HasChromeProxyViaHeader() or resp.remote_port != 80):
           r = resp.response
           raise ChromeProxyMetricException, (
               'Response for %s should have come through the fallback proxy.\n'
               'Response: remote_port=%s status=(%d, %s)\nHeaders:\n %s' % (
-                r.url, str(fallback_resp.remote_port), r.status, r.status_text,
+                r.url, str(resp.remote_port), r.status, r.status_text,
                 r.headers))
         else:
           via_fallback_count += 1
       resp = next(responses, None)
 
     # All other responses should be bypassed.
     while resp:
       if resp.HasChromeProxyViaHeader():
         r = resp.response
         raise ChromeProxyMetricException, (
@@ skipping 79 matching lines @@
             'Response for %s should have via header; proxy should no longer '
             'be bypassed.\nReponse: status=(%d, %s)\nHeaders:\n %s' % (
                 r.url, r.status, r.status_text, r.headers))
       else:
         via_count += 1
 
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'bypass', 'count', bypass_count))
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'via', 'count', via_count))