Ignore cache hits and invalid responses.

Also log bypass during via header checking and restart browser for each page.

BUG=374413

Review URL: https://codereview.chromium.org/292453006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271498 0039d316-1c4b-4281-b951-d872f2087c98

tools/perf/measurements/chrome_proxy.py

@@ -96,7 +96,7 @@ class ChromeProxyHeaders(ChromeProxyValidation):
   """Correctness measurement for response headers."""
 
   def __init__(self):
-    super(ChromeProxyHeaders, self).__init__()
+    super(ChromeProxyHeaders, self).__init__(restart_after_each_page=True)
 
   def AddResults(self, tab, results):
     self._metrics.AddResultsForHeaderValidation(tab, results)

tools/perf/metrics/chrome_proxy.py

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import datetime
+import logging
 import os
 
 from telemetry.page import page_measurement
@@ -51,8 +52,14 @@ class ChromeProxyResponse(network.HTTPResponse):
     # Ignore https and data url
     if resp.url.startswith('https') or resp.url.startswith('data:'):
       return False
-    # Ignore 304 Not Modified.
-    if resp.status == 304:
+    # 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
 
@@ -122,15 +129,32 @@ class ChromeProxyMetric(network.NetworkMetric):
 
   def AddResultsForHeaderValidation(self, tab, results):
     via_count = 0
+    bypass_count = 0
     for resp in self.IterResponses(tab):
       if resp.IsValidByViaHeader():
         via_count += 1
+      elif tab and self.IsProxyBypassed(tab):
+        logging.warning('Proxy bypassed for %s', resp.response.url)
+        bypass_count += 1
       else:
         r = resp.response
         raise ChromeProxyMetricException, (
             '%s: Via header (%s) is not valid (refer=%s, status=%d)' % (
                 r.url, r.GetHeader('Via'), r.GetHeader('Referer'), r.status))
     results.Add('checked_via_header', 'count', via_count)
+    results.Add('request_bypassed', 'count', bypass_count)
+
+  def IsProxyBypassed(self, tab):
+    """ Returns True if all configured proxies are bypassed."""
+    info = GetProxyInfoFromNetworkInternals(tab)
+    if not info['enabled']:
+      raise ChromeProxyMetricException, (
+          'Chrome proxy should be enabled. proxy info: %s' % info)
+
+    bad_proxies = [str(p['proxy']) for p in info['badProxies']].sort()
+    proxies = [self.effective_proxies['proxy'],
+               self.effective_proxies['fallback']].sort()
+    return bad_proxies == proxies
 
   @staticmethod
   def VerifyBadProxies(