| Index: net/proxy/mock_proxy_resolver.cc
|
| diff --git a/net/proxy/mock_proxy_resolver.cc b/net/proxy/mock_proxy_resolver.cc
|
| index 60c0aa9e5d175246e8f241e36cdfde9a097da668..eace850c17e5f34dceed1765bed40b112d305320 100644
|
| --- a/net/proxy/mock_proxy_resolver.cc
|
| +++ b/net/proxy/mock_proxy_resolver.cc
|
| @@ -30,11 +30,12 @@ MockAsyncProxyResolver::Request::~Request() {}
|
|
|
| MockAsyncProxyResolver::~MockAsyncProxyResolver() {}
|
|
|
| -int MockAsyncProxyResolver::GetProxyForURL(const GURL& url,
|
| - ProxyInfo* results,
|
| - const CompletionCallback& callback,
|
| - RequestHandle* request_handle,
|
| - const BoundNetLog& /*net_log*/) {
|
| +int MockAsyncProxyResolver::GetProxyForURL(
|
| + const GURL& url,
|
| + ProxyInfo* results,
|
| + const CompletionCallback& callback,
|
| + RequestHandle* request_handle,
|
| + const NetLogWithSource& /*net_log*/) {
|
| scoped_refptr<Request> request = new Request(this, url, results, callback);
|
| pending_requests_.push_back(request);
|
|
|
| @@ -160,7 +161,7 @@ int ForwardingProxyResolver::GetProxyForURL(const GURL& query_url,
|
| ProxyInfo* results,
|
| const CompletionCallback& callback,
|
| RequestHandle* request,
|
| - const BoundNetLog& net_log) {
|
| + const NetLogWithSource& net_log) {
|
| return impl_->GetProxyForURL(query_url, results, callback, request, net_log);
|
| }
|
|
|
|
|