Update metrics verification for dev-proxy.

tools/chrome_proxy/integration_tests/chrome_proxy_measurements.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 logging
 import urlparse
 
 from integration_tests import chrome_proxy_metrics as metrics
 from metrics import loading
@@ skipping 165 matching lines @@
     probe_url = GetResponseOverrideURL(
         _TEST_SERVER_DEFAULT_URL,
         respBody='not OK')
     options.AppendExtraBrowserArgs(
         '--data-reduction-proxy-probe-url=%s' % probe_url)
 
   def AddResults(self, tab, results):
     self._metrics.AddResultsForHTTPFallback(tab, results)
 
 
-# Depends on the fix of http://crbug.com/330342.
 class ChromeProxyHTTPFallbackViaHeader(ChromeProxyValidation):
   """Correctness measurement for proxy fallback.
 
   In this test, the configured proxy is the chromeproxy-test server which
   will send back a response without the expected Via header. Chrome is
   expected to use the fallback proxy and add the configured proxy to the
   bad proxy list.
   """
 
   def __init__(self):
     super(ChromeProxyHTTPFallbackViaHeader, self).__init__()
 
   def CustomizeBrowserOptions(self, options):
     super(ChromeProxyHTTPFallbackViaHeader,
           self).CustomizeBrowserOptions(options)
     options.AppendExtraBrowserArgs('--ignore-certificate-errors')
     options.AppendExtraBrowserArgs(
         '--spdy-proxy-auth-origin=http://%s' % _TEST_SERVER)
     options.AppendExtraBrowserArgs(
         '--spdy-proxy-auth-value=%s' % _FAKE_PROXY_AUTH_VALUE)
 
   def AddResults(self, tab, results):
     proxies = [
         _TEST_SERVER + ":80",
         self._metrics.effective_proxies['fallback'],
         self._metrics.effective_proxies['direct']]
-    bad_proxies = [_TEST_SERVER + ":80"]
+    bad_proxies = [_TEST_SERVER + ":80", metrics.PROXY_SETTING_HTTP]
     self._metrics.AddResultsForHTTPFallback(tab, results, proxies, bad_proxies)
 
 
 class ChromeProxySmoke(ChromeProxyValidation):
   """Smoke measurement for basic chrome proxy correctness."""
 
   def __init__(self):
     super(ChromeProxySmoke, self).__init__()
 
   def WillNavigateToPage(self, page, tab):
@@ skipping 19 matching lines @@
             ],
         'bypass': [self._metrics.AddResultsForBypass],
         'safebrowsing': [self._metrics.AddResultsForSafebrowsing],
         }
     if not self._page.name in page_to_metrics:
       raise page_test.MeasurementFailure(
           'Invalid page name (%s) in smoke. Page name must be one of:\n%s' % (
           self._page.name, page_to_metrics.keys()))
     for add_result in page_to_metrics[self._page.name]:
       add_result(tab, results)