| Index: net/proxy/proxy_resolver_winhttp.cc
|
| diff --git a/net/proxy/proxy_resolver_winhttp.cc b/net/proxy/proxy_resolver_winhttp.cc
|
| index bfdce33252ff972e0037bfe4052ef979abbeb0f0..1a89daf25ae57500efff232011777b73cbec7c64 100644
|
| --- a/net/proxy/proxy_resolver_winhttp.cc
|
| +++ b/net/proxy/proxy_resolver_winhttp.cc
|
| @@ -61,11 +61,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();
|
| @@ -94,7 +91,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())
|
| @@ -174,16 +171,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,
|
|
|