Index: net/proxy/proxy_resolver_winhttp.cc |
=================================================================== |
--- net/proxy/proxy_resolver_winhttp.cc (revision 21630) |
+++ net/proxy/proxy_resolver_winhttp.cc (working copy) |
@@ -45,7 +45,7 @@ |
} |
ProxyResolverWinHttp::ProxyResolverWinHttp() |
- : ProxyResolver(true), session_handle_(NULL) { |
+ : ProxyResolver(false /*expects_pac_bytes*/), session_handle_(NULL) { |
} |
ProxyResolverWinHttp::~ProxyResolverWinHttp() { |
@@ -53,8 +53,9 @@ |
} |
int ProxyResolverWinHttp::GetProxyForURL(const GURL& query_url, |
- const GURL& pac_url, |
- ProxyInfo* results) { |
+ ProxyInfo* results, |
+ CompletionCallback* /*callback*/, |
+ RequestHandle* /*request*/) { |
// If we don't have a WinHTTP session, then create a new one. |
if (!session_handle_ && !OpenWinHttpSession()) |
return ERR_FAILED; |
@@ -68,7 +69,7 @@ |
WINHTTP_AUTOPROXY_OPTIONS options = {0}; |
options.fAutoLogonIfChallenged = FALSE; |
options.dwFlags = WINHTTP_AUTOPROXY_CONFIG_URL; |
- std::wstring pac_url_wide = ASCIIToWide(pac_url.spec()); |
+ std::wstring pac_url_wide = ASCIIToWide(pac_url_.spec()); |
options.lpszAutoConfigUrl = |
pac_url_wide.empty() ? L"http://wpad/wpad.dat" : pac_url_wide.c_str(); |
@@ -134,6 +135,15 @@ |
return rv; |
} |
+void ProxyResolverWinHttp::CancelRequest(RequestHandle request) { |
+ // This is a synchronous ProxyResolver; no possibility for async requests. |
+ NOTREACHED(); |
+} |
+ |
+void ProxyResolverWinHttp::SetPacScriptByUrlInternal(const GURL& pac_url) { |
+ pac_url_ = pac_url; |
+} |
+ |
bool ProxyResolverWinHttp::OpenWinHttpSession() { |
DCHECK(!session_handle_); |
session_handle_ = WinHttpOpen(NULL, |