| Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.cc
|
| diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.cc
|
| index 6eb2fe3e22616660ce2276e1f6e400c4373a27cb..4acb735e20f37c7786c47a06fda14e6b5677e367 100644
|
| --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.cc
|
| +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.cc
|
| @@ -101,26 +101,26 @@ void OnResolveProxyHandler(const GURL& url,
|
| const std::string& method,
|
| int load_flags,
|
| const net::ProxyConfig& data_reduction_proxy_config,
|
| const net::ProxyRetryInfoMap& proxy_retry_info,
|
| const DataReductionProxyConfig* config,
|
| net::ProxyInfo* result) {
|
| DCHECK(config);
|
| DCHECK(result->is_empty() || result->is_direct() ||
|
| !config->IsDataReductionProxy(result->proxy_server().host_port_pair(),
|
| NULL));
|
| - if (!EligibleForDataReductionProxy(*result, url, method))
|
| + if (!util::EligibleForDataReductionProxy(*result, url, method))
|
| return;
|
| net::ProxyInfo data_reduction_proxy_info;
|
| - bool data_saver_proxy_used =
|
| - ApplyProxyConfigToProxyInfo(data_reduction_proxy_config, proxy_retry_info,
|
| - url, &data_reduction_proxy_info);
|
| + bool data_saver_proxy_used = util::ApplyProxyConfigToProxyInfo(
|
| + data_reduction_proxy_config, proxy_retry_info, url,
|
| + &data_reduction_proxy_info);
|
| if (data_saver_proxy_used)
|
| result->OverrideProxyList(data_reduction_proxy_info.proxy_list());
|
| if (config->enabled_by_user_and_reachable() && url.SchemeIsHTTPOrHTTPS() &&
|
| !url.SchemeIsCryptographic() && !net::IsLocalhost(url.host())) {
|
| UMA_HISTOGRAM_BOOLEAN("DataReductionProxy.ConfigService.HTTPRequests",
|
| data_saver_proxy_used);
|
| }
|
| }
|
|
|
| } // namespace data_reduction_proxy
|
|
|