Use data reduction proxy when managed proxy config returns direct

Adds the configured data reduction proxies if any to the proxy info
for a request, if the data reduction proxy is enabled, the data
reduction proxies are not bypassed, and the proxy server returned
by the proxy info if the request is direct.

This change makes it possible for the data reduction proxy to
coexist with managed proxy configurations, instead of being
overwritten by them. The data reduction proxy may be disabled
via managed prefs if this behavior is not desired.

BUG=339237,339258

Review URL: https://codereview.chromium.org/449973002

Cr-Commit-Position: refs/heads/master@{#289528}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289528 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 2 deletions

diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 4006110..6bd519c 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -1297,7 +1297,7 @@ int ProxyService::DidFinishResolvingProxy(const GURL& url,
     // Allow the network delegate to interpose on the resolution decision,
     // possibly modifying the ProxyInfo.
     if (network_delegate)
-      network_delegate->NotifyResolveProxy(url, load_flags, result);
+      network_delegate->NotifyResolveProxy(url, load_flags, *this, result);
 
     // When logging all events is enabled, dump the proxy list.
     if (net_log.IsLogging()) {
@@ -1324,7 +1324,7 @@ int ProxyService::DidFinishResolvingProxy(const GURL& url,
       // Allow the network delegate to interpose on the resolution decision,
       // possibly modifying the ProxyInfo.
       if (network_delegate)
-        network_delegate->NotifyResolveProxy(url, load_flags, result);
+        network_delegate->NotifyResolveProxy(url, load_flags, *this, result);
     } else {
       result_code = ERR_MANDATORY_PROXY_CONFIGURATION_FAILED;
     }