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 4acb735e20f37c7786c47a06fda14e6b5677e367..d7724279f5a7efe964ca0f0a7e443f54bf581bd9 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 |
@@ -41,26 +41,24 @@ DataReductionProxyDelegate::DataReductionProxyDelegate( |
DCHECK(bypass_stats); |
DCHECK(net_log); |
} |
DataReductionProxyDelegate::~DataReductionProxyDelegate() { |
} |
void DataReductionProxyDelegate::OnResolveProxy( |
const GURL& url, |
const std::string& method, |
- int load_flags, |
const net::ProxyService& proxy_service, |
net::ProxyInfo* result) { |
DCHECK(result); |
- OnResolveProxyHandler(url, method, load_flags, |
- configurator_->GetProxyConfig(), |
+ OnResolveProxyHandler(url, method, configurator_->GetProxyConfig(), |
proxy_service.proxy_retry_info(), config_, result); |
} |
void DataReductionProxyDelegate::OnTunnelConnectCompleted( |
const net::HostPortPair& endpoint, |
const net::HostPortPair& proxy_server, |
int net_error) { |
} |
void DataReductionProxyDelegate::OnFallback(const net::ProxyServer& bad_proxy, |
@@ -92,21 +90,20 @@ bool DataReductionProxyDelegate::IsTrustedSpdyProxy( |
} |
void DataReductionProxyDelegate::OnTunnelHeadersReceived( |
const net::HostPortPair& origin, |
const net::HostPortPair& proxy_server, |
const net::HttpResponseHeaders& response_headers) { |
} |
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 (!util::EligibleForDataReductionProxy(*result, url, method)) |
return; |