Make Data Saver integration test use new secure proxy check URL flag.

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 187 matching lines @@
 
 
 class ChromeProxyHTTPFallbackProbeURL(ChromeProxyValidation):
   """Correctness measurement for proxy fallback.
 
   In this test, the probe URL does not return 'OK'. Chrome is expected
   to use the fallback proxy.
   """
 
   def __init__(self):
-    super(ChromeProxyHTTPFallbackProbeURL, self).__init__()
+    super(ChromeProxyHTTPFallbackProbeURL, self).__init__(
+        restart_after_each_page=True)

[bengr, 2015/03/03 17:49:29]

I suppose this is ok, but in the future, please don't make unrelated function
changes in a CL. (Unrelated stylistic changes are ok.)

[sclittle, 2015/03/03 18:14:35]

OK.

 
   def CustomizeBrowserOptions(self, options):
     super(ChromeProxyHTTPFallbackProbeURL,
           self).CustomizeBrowserOptions(options)
     # Use the test server probe URL which returns the response
     # body as specified by respBody.
-    probe_url = GetResponseOverrideURL(
-        respBody='not OK')
+    probe_url = GetResponseOverrideURL(respBody='not OK')
     options.AppendExtraBrowserArgs(
-        '--data-reduction-proxy-probe-url=%s' % probe_url)
+        '--data-reduction-proxy-secure-proxy-check-url=%s' % probe_url)
 
   def AddResults(self, tab, results):
     self._metrics.AddResultsForHTTPFallback(tab, results)
 
 
 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
@@ skipping 129 matching lines @@
             self._metrics.AddResultsForDataSaving,
             ],
         'bypass': [self._metrics.AddResultsForBypass],
         }
     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)