New urls for the check.googlezip.net test pages.

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 241 matching lines @@
                               bypass_for_client_type):
     via_count = 0
     bypass_count = 0
 
     for resp in self.IterResponses(tab):
       if resp.HasChromeProxyViaHeader():
         via_count += 1
         if client_type.lower() == bypass_for_client_type.lower():
           raise ChromeProxyMetricException, (
               '%s: Response for client of type "%s" has via header, but should '
-              'be bypassed.' % (
-                  resp.response.url, bypass_for_client_type, client_type))
+              'be bypassed.' % (resp.response.url, bypass_for_client_type))
       elif resp.ShouldHaveChromeProxyViaHeader():
         bypass_count += 1
         if client_type.lower() != bypass_for_client_type.lower():
           raise ChromeProxyMetricException, (
               '%s: Response missing via header. Only "%s" clients should '
               'bypass for this page, but this client is "%s".' % (
                   resp.response.url, bypass_for_client_type, client_type))
 
     if via_count + bypass_count == 0:
       raise ChromeProxyMetricException, (
@@ skipping 278 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))