Check effective proxy config before adding data reduction proxies

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 d295cc0620b0a4fc54ec3eb7e6f81613c6471937..1954b36cad472e7dafa7544260df5e5601335598 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -442,8 +442,10 @@ void ChromeNetworkDelegate::OnResolveProxy(
       !proxy_config_getter_.is_null()) {
     on_resolve_proxy_handler_.Run(url, load_flags,
                                   proxy_config_getter_.Run(),
+                                  proxy_service.config(),

[marq (ping after 24h), 2014/10/28 08:15:27]

This change will also need to be made in CrNet's network delegate; becuase this
is an API change, the crnet build will break when this change is merged, so
there's no risk of this change not being picked up.

[bengr, 2014/10/29 21:12:36]

Acknowledged.

                                   proxy_service.proxy_retry_info(),
-                                  data_reduction_proxy_params_, result);
+                                  data_reduction_proxy_params_,
+                                  result);

[marq (ping after 24h), 2014/10/28 08:15:27]

No need to move this onto another line, as method calls can have multiple params
per line. Or, if you really want one param per line, also split url and
load_flags  on the first line.

[bengr, 2014/10/29 21:12:36]

Done.

   }
 }