Fix broken chrome_proxy unit tests

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 common import chrome_proxy_metrics as common_metrics
 from common import network_metrics_unittest as network_unittest
 from integration_tests import chrome_proxy_metrics as metrics
 from telemetry.testing import test_page_test_results
 
 TEST_EXTRA_VIA_HEADER = '1.1 EXTRA_VIA_HEADER'
 
 # Timeline events used in tests.
 # An HTML not via proxy.
 EVENT_HTML_DIRECT = network_unittest.NetworkMetricTest.MakeNetworkTimelineEvent(
     url='http://test.html1',
     response_headers={
         'Content-Type': 'text/html',
         'Content-Length': str(len(network_unittest.HTML_BODY)),
         },
     body=network_unittest.HTML_BODY)
 
+# A BlockOnce response not via proxy.
+EVENT_HTML_BLOCKONCE = (
+    network_unittest.NetworkMetricTest.MakeNetworkTimelineEvent(
+    url='http://check.googlezip.net/blocksingle/',
+    response_headers={
+        'Content-Type': 'text/html',
+        'Content-Length': str(len(network_unittest.HTML_BODY)),
+        },
+    body=network_unittest.HTML_BODY))
+
 # An HTML via proxy.
 EVENT_HTML_PROXY_VIA = (
     network_unittest.NetworkMetricTest.MakeNetworkTimelineEvent(
     url='http://test.html2',
     response_headers={
         'Content-Type': 'text/html',
         'Content-Encoding': 'gzip',
         'X-Original-Content-Length': str(len(network_unittest.HTML_BODY)),
         'Via': '1.1 ' + common_metrics.CHROME_PROXY_VIA_HEADER,
         },
@@ skipping 222 matching lines @@
     metric.SetEvents([])
     no_responses_exception = False
     try:
       metric.AddResultsForCorsBypass(None, results)
     except common_metrics.ChromeProxyMetricException:
       no_responses_exception = True
     self.assertTrue(no_responses_exception)
 
   def testChromeProxyMetricForBlockOnce(self):
     metric = metrics.ChromeProxyMetric()
-    metric.SetEvents([EVENT_HTML_DIRECT,
+    metric.SetEvents([EVENT_HTML_BLOCKONCE,
+                      EVENT_HTML_BLOCKONCE,
                       EVENT_IMAGE_PROXY_VIA])
     results = test_page_test_results.TestPageTestResults(self)
     metric.AddResultsForBlockOnce(None, results)
     results.AssertHasPageSpecificScalarValue('eligible_responses', 'count', 2)
-    results.AssertHasPageSpecificScalarValue('bypass', 'count', 1)
 
-    metric.SetEvents([EVENT_HTML_DIRECT,
+    metric.SetEvents([EVENT_HTML_BLOCKONCE,
+                      EVENT_HTML_BLOCKONCE,
                       EVENT_IMAGE_DIRECT])
     exception_occurred = False
     try:
       metric.AddResultsForBlockOnce(None, results)
     except common_metrics.ChromeProxyMetricException:
       exception_occurred = True
     # The second response was over direct, but was expected via proxy.
     self.assertTrue(exception_occurred)
 
     # Passing in zero responses should cause a failure.
@@ skipping 93 matching lines @@
 
     # Passing in zero responses should cause a failure.
     metric.SetEvents([])
     no_responses_exception = False
     try:
       metric.AddResultsForHTTPToDirectFallback(None, results, 'test.html2')
     except common_metrics.ChromeProxyMetricException:
       no_responses_exception = True
     self.assertTrue(no_responses_exception)