Check effective proxy config before adding data reduction proxies

chrome/browser/net/chrome_network_delegate.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_
 #define CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 54 matching lines @@
 
 namespace prerender {
 class PrerenderTracker;
 }
 
 // ChromeNetworkDelegate is the central point from within the chrome code to
 // add hooks into the network stack.
 class ChromeNetworkDelegate : public net::NetworkDelegate {
  public:
   // Provides an opportunity to interpose on proxy resolution. Called before
   // ProxyService.ResolveProxy() returns. |proxy_info| contains information

[mef, 2014/10/30 21:05:36]

There is no |proxy_info| parameter.

[bengr, 2014/11/03 23:26:57]

Done.

   // about the proxy being used, and may be modified by this callback.
   typedef base::Callback<void(
       const GURL& url,
       int load_flags,
       const net::ProxyConfig& data_reduction_proxy_config,
+      const net::ProxyConfig& proxy_service_proxy_config,
       const net::ProxyRetryInfoMap& proxy_retry_info_map,
       const data_reduction_proxy::DataReductionProxyParams* params,
       net::ProxyInfo* result)> OnResolveProxyHandler;
 
   // Provides an additional proxy configuration that can be consulted after
   // proxy resolution.
   typedef base::Callback<const net::ProxyConfig&()> ProxyConfigGetter;
 
   // |enable_referrers| (and all of the other optional PrefMembers) should be
   // initialized on the UI thread (see below) beforehand. This object's owner is
@@ skipping 236 matching lines @@
   data_reduction_proxy::DataReductionProxyStatisticsPrefs*
       data_reduction_proxy_statistics_prefs_;
 
   OnResolveProxyHandler on_resolve_proxy_handler_;
   ProxyConfigGetter proxy_config_getter_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeNetworkDelegate);
 };
 
 #endif  // CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_