Check effective proxy config before adding data reduction proxies

chrome/browser/net/chrome_network_delegate.cc

 // 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.
 
 #include "chrome/browser/net/chrome_network_delegate.h"
 
 #include <stdlib.h>
 
 #include <vector>
 
@@ skipping 424 matching lines @@
 
 void ChromeNetworkDelegate::OnResolveProxy(
     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()) {
     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.

   }
 }
 
 void ChromeNetworkDelegate::OnProxyFallback(const net::ProxyServer& bad_proxy,
                                             int net_error) {
   if (data_reduction_proxy_usage_stats_) {
     data_reduction_proxy_usage_stats_->OnProxyFallback(
         bad_proxy, net_error);
   }
 }
@@ skipping 381 matching lines @@
   if (data_reduction_proxy_statistics_prefs_) {
     StoreAccumulatedContentLength(received_content_length,
                                   original_content_length,
                                   request_type,
                                   reinterpret_cast<Profile*>(profile_),
                                   data_reduction_proxy_statistics_prefs_);
   }
   received_content_length_ += received_content_length;
   original_content_length_ += original_content_length;
 }