Index: net/proxy/proxy_resolver_winhttp.cc |
diff --git a/net/proxy/proxy_resolver_winhttp.cc b/net/proxy/proxy_resolver_winhttp.cc |
index 7dccbf0b93c8f3d475be63c4d1a090ced649a87f..a2b50d222269b6e6129ccde8cd9c004eb85d36df 100644 |
--- a/net/proxy/proxy_resolver_winhttp.cc |
+++ b/net/proxy/proxy_resolver_winhttp.cc |
@@ -62,11 +62,8 @@ class ProxyResolverWinHttp : 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: |
bool OpenWinHttpSession(); |
@@ -95,7 +92,7 @@ ProxyResolverWinHttp::~ProxyResolverWinHttp() { |
int ProxyResolverWinHttp::GetProxyForURL(const GURL& query_url, |
ProxyInfo* results, |
const CompletionCallback& /*callback*/, |
- RequestHandle* /*request*/, |
+ scoped_ptr<Request>* /*request*/, |
const BoundNetLog& /*net_log*/) { |
// If we don't have a WinHTTP session, then create a new one. |
if (!session_handle_ && !OpenWinHttpSession()) |
@@ -175,16 +172,6 @@ int ProxyResolverWinHttp::GetProxyForURL(const GURL& query_url, |
return rv; |
} |
-void ProxyResolverWinHttp::CancelRequest(RequestHandle request) { |
- // This is a synchronous ProxyResolver; no possibility for async requests. |
- NOTREACHED(); |
-} |
- |
-LoadState ProxyResolverWinHttp::GetLoadState(RequestHandle request) const { |
- NOTREACHED(); |
- return LOAD_STATE_IDLE; |
-} |
- |
bool ProxyResolverWinHttp::OpenWinHttpSession() { |
DCHECK(!session_handle_); |
session_handle_ = WinHttpOpen(NULL, |