Use data reduction proxy when managed proxy config returns direct

chrome/browser/net/chrome_network_delegate.cc

Index: chrome/browser/net/chrome_network_delegate.cc
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
index 3d0f1b62094f43b673b08e6e476bc14a16313171..37683b033b47f9bc1da005ccf1afca2204f70ca9 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -47,7 +47,9 @@
 #include "net/cookies/cookie_options.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
+#include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_info.h"
+#include "net/proxy/proxy_retry_info.h"
 #include "net/proxy/proxy_server.h"
 #include "net/socket_stream/socket_stream.h"
 #include "net/url_request/url_request.h"
@@ -427,9 +429,15 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
 }
 
 void ChromeNetworkDelegate::OnResolveProxy(
-    const GURL& url, int load_flags, net::ProxyInfo* result) {
-  if (!on_resolve_proxy_handler_.is_null()) {
+    const GURL& url,
+    int load_flags,
+    const net::ProxyService& proxy_service,
+    net::ProxyInfo* result) {
+  if (!on_resolve_proxy_handler_.is_null() &&
+      !proxy_config_getter_.is_null()) {

[Ryan Sleevi, 2014/08/14 19:19:50]

Is this correct? It now forces proxy_config_getter_ to be non-NULL, which isn't
documented in the header as being required (it suggests it's optional, by virtue
of having an extra setter)

     on_resolve_proxy_handler_.Run(url, load_flags,
+                                  proxy_config_getter_.Run(),
+                                  proxy_service.proxy_retry_info(),
                                   data_reduction_proxy_params_, result);
   }
 }