Chromium Code Reviews| Index: net/proxy/proxy_resolver_winhttp.cc |
| diff --git a/net/proxy/proxy_resolver_winhttp.cc b/net/proxy/proxy_resolver_winhttp.cc |
| index 2d90dab6e05f4806cd4d528ae0f58e0d1b9df555..d200a9481e6078a4aad1cdbc21d6fad58499131c 100644 |
| --- a/net/proxy/proxy_resolver_winhttp.cc |
| +++ b/net/proxy/proxy_resolver_winhttp.cc |
| @@ -54,8 +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 = base::ASCIIToWide(pac_url_.spec()); |
| - options.lpszAutoConfigUrl = pac_url_wide.c_str(); |
| + options.lpszAutoConfigUrl = base::ASCIIToUTF16(pac_url_.spec()).c_str(); |
|
cpu_(ooo_6.6-7.5)
2014/11/03 17:33:27
looks buggy, the c_str() is that of a temporary st
Lei Zhang
2014/11/03 23:02:10
Whoops, undone.
|
| WINHTTP_PROXY_INFO info = {0}; |
| DCHECK(session_handle_); |
| @@ -66,13 +65,13 @@ int ProxyResolverWinHttp::GetProxyForURL(const GURL& query_url, |
| // 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_, |
| - base::ASCIIToWide(query_url.spec()).c_str(), |
| + base::ASCIIToUTF16(query_url.spec()).c_str(), |
| &options, &info); |
| if (!ok) { |
| if (ERROR_WINHTTP_LOGIN_FAILURE == GetLastError()) { |
| options.fAutoLogonIfChallenged = TRUE; |
| ok = WinHttpGetProxyForUrl( |
| - session_handle_, base::ASCIIToWide(query_url.spec()).c_str(), |
| + session_handle_, base::ASCIIToUTF16(query_url.spec()).c_str(), |
| &options, &info); |
| } |
| if (!ok) { |