| Index: net/proxy/proxy_resolver_v8_tracing_wrapper.cc
|
| diff --git a/net/proxy/proxy_resolver_v8_tracing_wrapper.cc b/net/proxy/proxy_resolver_v8_tracing_wrapper.cc
|
| index 767087c75173990984bdc56c26cff01248a5361d..25144b6181317a0d2d4ccef805b5bcb051b5172d 100644
|
| --- a/net/proxy/proxy_resolver_v8_tracing_wrapper.cc
|
| +++ b/net/proxy/proxy_resolver_v8_tracing_wrapper.cc
|
| @@ -88,8 +88,12 @@
|
| int GetProxyForURL(const GURL& url,
|
| ProxyInfo* results,
|
| const CompletionCallback& callback,
|
| - scoped_ptr<Request>* request,
|
| + RequestHandle* request,
|
| const BoundNetLog& net_log) override;
|
| +
|
| + void CancelRequest(RequestHandle request) override;
|
| +
|
| + LoadState GetLoadState(RequestHandle request) const override;
|
|
|
| private:
|
| scoped_ptr<ProxyResolverV8Tracing> resolver_impl_;
|
| @@ -114,13 +118,22 @@
|
| const GURL& url,
|
| ProxyInfo* results,
|
| const CompletionCallback& callback,
|
| - scoped_ptr<Request>* request,
|
| + RequestHandle* request,
|
| const BoundNetLog& net_log) {
|
| resolver_impl_->GetProxyForURL(
|
| url, results, callback, request,
|
| make_scoped_ptr(new BindingsImpl(error_observer_.get(), host_resolver_,
|
| net_log_, net_log)));
|
| return ERR_IO_PENDING;
|
| +}
|
| +
|
| +void ProxyResolverV8TracingWrapper::CancelRequest(RequestHandle request) {
|
| + resolver_impl_->CancelRequest(request);
|
| +}
|
| +
|
| +LoadState ProxyResolverV8TracingWrapper::GetLoadState(
|
| + RequestHandle request) const {
|
| + return resolver_impl_->GetLoadState(request);
|
| }
|
|
|
| } // namespace
|
|
|