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

Unified Diff: net/proxy/proxy_resolver_winhttp.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: Created 5 years, 1 month 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_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,

Powered by Google App Engine
This is Rietveld 408576698