| Index: net/base/network_delegate.cc
|
| diff --git a/net/base/network_delegate.cc b/net/base/network_delegate.cc
|
| index 759175289b9c830525e2907f2950b9ce8a122f99..a2b282bbe1f155d11294882ab1bf0db9c24cf7d8 100644
|
| --- a/net/base/network_delegate.cc
|
| +++ b/net/base/network_delegate.cc
|
| @@ -21,11 +21,14 @@ int NetworkDelegate::NotifyBeforeURLRequest(
|
| return OnBeforeURLRequest(request, callback, new_url);
|
| }
|
|
|
| -void NetworkDelegate::NotifyResolveProxy(const GURL& url, int load_flags,
|
| - ProxyInfo* result) {
|
| +void NetworkDelegate::NotifyResolveProxy(
|
| + const GURL& url,
|
| + int load_flags,
|
| + const ProxyService* proxy_service,
|
| + ProxyInfo* result) {
|
| DCHECK(CalledOnValidThread());
|
| DCHECK(result);
|
| - OnResolveProxy(url, load_flags, result);
|
| + OnResolveProxy(url, load_flags, proxy_service, result);
|
| }
|
|
|
| void NetworkDelegate::NotifyProxyFallback(
|
| @@ -170,8 +173,11 @@ int NetworkDelegate::OnBeforeURLRequest(URLRequest* request,
|
| return OK;
|
| }
|
|
|
| -void NetworkDelegate::OnResolveProxy(const GURL& url, int load_flags,
|
| - ProxyInfo* result) {
|
| +void NetworkDelegate::OnResolveProxy(
|
| + const GURL& url,
|
| + int load_flags,
|
| + const ProxyService* proxy_service,
|
| + ProxyInfo* result) {
|
| }
|
|
|
| void NetworkDelegate::OnProxyFallback(const ProxyServer& bad_proxy,
|
|
|