Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1690)

Unified Diff: net/proxy/proxy_resolver_v8_tracing_wrapper.cc

Issue 1439053002: Change ProxyResolver::GetProxyForURL() to take a scoped_ptr<Request>* rather than a RequestHandle* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restore scoped_ptr to mock and nits Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 25144b6181317a0d2d4ccef805b5bcb051b5172d..767087c75173990984bdc56c26cff01248a5361d 100644
--- a/net/proxy/proxy_resolver_v8_tracing_wrapper.cc
+++ b/net/proxy/proxy_resolver_v8_tracing_wrapper.cc
@@ -88,13 +88,9 @@ class ProxyResolverV8TracingWrapper : public ProxyResolver {
int GetProxyForURL(const GURL& url,
ProxyInfo* results,
const CompletionCallback& callback,
- RequestHandle* request,
+ scoped_ptr<Request>* request,
const BoundNetLog& net_log) override;
- void CancelRequest(RequestHandle request) override;
-
- LoadState GetLoadState(RequestHandle request) const override;
-
private:
scoped_ptr<ProxyResolverV8Tracing> resolver_impl_;
NetLog* net_log_;
@@ -118,7 +114,7 @@ int ProxyResolverV8TracingWrapper::GetProxyForURL(
const GURL& url,
ProxyInfo* results,
const CompletionCallback& callback,
- RequestHandle* request,
+ scoped_ptr<Request>* request,
const BoundNetLog& net_log) {
resolver_impl_->GetProxyForURL(
url, results, callback, request,
@@ -127,15 +123,6 @@ int ProxyResolverV8TracingWrapper::GetProxyForURL(
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
ProxyResolverFactoryV8TracingWrapper::ProxyResolverFactoryV8TracingWrapper(
« no previous file with comments | « net/proxy/proxy_resolver_v8_tracing_unittest.cc ('k') | net/proxy/proxy_resolver_v8_tracing_wrapper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698