Use data reduction proxy when managed proxy config returns direct

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"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_metrics.h"
 #include "net/base/network_delegate.h"
+#include "net/proxy/proxy_retry_info.h"
 
 class ChromeExtensionsNetworkDelegate;
 class ClientHints;
 class CookieSettings;
 class PrefService;
 
 template<class T> class PrefMember;
 
 typedef PrefMember<bool> BooleanPrefMember;
 
@@ skipping 15 matching lines @@
 namespace domain_reliability {
 class DomainReliabilityMonitor;
 }  // namespace domain_reliability
 
 namespace extensions {
 class EventRouterForwarder;
 class InfoMap;
 }
 
 namespace net {
+class ProxyConfig;
 class ProxyInfo;
 class ProxyServer;
+class ProxyService;
 class URLRequest;
 }
 
 namespace policy {
 class URLBlacklistManager;
 }
 
 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
   // 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::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<void(net::ProxyConfig* proxy_config)>
+      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
   // responsible for cleaning them up at shutdown.
   ChromeNetworkDelegate(extensions::EventRouterForwarder* event_router,
                         BooleanPrefMember* enable_referrers);
   virtual ~ChromeNetworkDelegate();
 
   // Pass through to ChromeExtensionsNetworkDelegate::set_extension_info_map().
   void set_extension_info_map(extensions::InfoMap* extension_info_map);
 
@@ skipping 65 matching lines @@
   // ChromeNetworkDelegate.
   void set_data_reduction_proxy_auth_request_handler(
       data_reduction_proxy::DataReductionProxyAuthRequestHandler* handler) {
     data_reduction_proxy_auth_request_handler_ = handler;
   }
 
   void set_on_resolve_proxy_handler(OnResolveProxyHandler handler) {
     on_resolve_proxy_handler_ = handler;
   }
 
+  void set_proxy_config_getter(ProxyConfigGetter getter) {

[mef, 2014/08/11 19:44:40]

const &?

[bengr, 2014/08/11 23:03:19]

Done.

+    proxy_config_getter_ = getter;
+  }
+
+

[marq (ping after 24h), 2014/08/11 16:11:33]

Extra line.

[bengr, 2014/08/11 23:03:19]

Done.

   // Adds the Client Hints header to HTTP requests.
   void SetEnableClientHints();
 
   // Causes |OnCanThrottleRequest| to always return false, for all
   // instances of this object.
   static void NeverThrottleRequests();
 
   // Binds the pref members to |pref_service| and moves them to the IO thread.
   // |enable_referrers| cannot be NULL, the others can.
   // This method should be called on the UI thread.
@@ skipping 17 matching lines @@
   base::Value* SessionNetworkStatsInfoToValue() const;
 
  private:
   friend class ChromeNetworkDelegateTest;
 
   // NetworkDelegate implementation.
   virtual int OnBeforeURLRequest(net::URLRequest* request,
                                  const net::CompletionCallback& callback,
                                  GURL* new_url) OVERRIDE;
   virtual void OnResolveProxy(
-      const GURL& url, int load_flags, net::ProxyInfo* result) OVERRIDE;
+      const GURL& url,
+      int load_flags,
+      const net::ProxyService* proxy_service,
+      net::ProxyInfo* result) OVERRIDE;
   virtual void OnProxyFallback(const net::ProxyServer& bad_proxy,
                                int net_error,
                                bool did_fallback) OVERRIDE;
   virtual int OnBeforeSendHeaders(net::URLRequest* request,
                                   const net::CompletionCallback& callback,
                                   net::HttpRequestHeaders* headers) OVERRIDE;
   virtual void OnBeforeSendProxyHeaders(
       net::URLRequest* request,
       const net::ProxyInfo& proxy_info,
       net::HttpRequestHeaders* headers) OVERRIDE;
@@ skipping 87 matching lines @@
   // |data_reduction_proxy_params_| must outlive this ChromeNetworkDelegate.
   data_reduction_proxy::DataReductionProxyParams* data_reduction_proxy_params_;
   // |data_reduction_proxy_usage_stats_| must outlive this
   // ChromeNetworkDelegate.
   data_reduction_proxy::DataReductionProxyUsageStats*
       data_reduction_proxy_usage_stats_;
   data_reduction_proxy::DataReductionProxyAuthRequestHandler*
   data_reduction_proxy_auth_request_handler_;
 
   OnResolveProxyHandler on_resolve_proxy_handler_;
+  ProxyConfigGetter proxy_config_getter_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeNetworkDelegate);
 };
 
 #endif  // CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_