Index: net/proxy/proxy_resolver_winhttp.cc |
diff --git a/net/proxy/proxy_resolver_winhttp.cc b/net/proxy/proxy_resolver_winhttp.cc |
index 32737875e3e6de5d46d1666a0ebf3e3373943616..116b33c2991240c022a4e2e2d4285a3916667cc6 100644 |
--- a/net/proxy/proxy_resolver_winhttp.cc |
+++ b/net/proxy/proxy_resolver_winhttp.cc |
@@ -54,7 +54,7 @@ int ProxyResolverWinHttp::GetProxyForURL(const GURL& query_url, |
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 = base::ASCIIToWide(pac_url_.spec()); |
options.lpszAutoConfigUrl = pac_url_wide.c_str(); |
WINHTTP_PROXY_INFO info = {0}; |
@@ -65,13 +65,14 @@ int ProxyResolverWinHttp::GetProxyForURL(const GURL& query_url, |
// Otherwise, we fail over to trying it with a value of true. This way we |
// get good performance in the case where WinHTTP uses an out-of-process |
// resolver. This is important for Vista and Win2k3. |
- BOOL ok = WinHttpGetProxyForUrl( |
- session_handle_, ASCIIToWide(query_url.spec()).c_str(), &options, &info); |
+ BOOL ok = WinHttpGetProxyForUrl(session_handle_, |
+ base::ASCIIToWide(query_url.spec()).c_str(), |
+ &options, &info); |
if (!ok) { |
if (ERROR_WINHTTP_LOGIN_FAILURE == GetLastError()) { |
options.fAutoLogonIfChallenged = TRUE; |
ok = WinHttpGetProxyForUrl( |
- session_handle_, ASCIIToWide(query_url.spec()).c_str(), |
+ session_handle_, base::ASCIIToWide(query_url.spec()).c_str(), |
&options, &info); |
} |
if (!ok) { |