diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 21:11:46 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 21:11:46 +0000 |
| commit | 74f778ee567a5e18ae6766416711b92fc6e7f39a (patch) | |
| tree | c2da3cc66ebb5285d8ff3f210ebdb446eb61837f /net/proxy/proxy_resolver_winhttp.cc | |
| parent | a80aea7ebc002065d8f24c54673c72cb61d47b07 (diff) | |
| download | chromium_src-74f778ee567a5e18ae6766416711b92fc6e7f39a.zip chromium_src-74f778ee567a5e18ae6766416711b92fc6e7f39a.tar.gz chromium_src-74f778ee567a5e18ae6766416711b92fc6e7f39a.tar.bz2 | |
Move UTF16ToASCII, remove WideToASCII.
This removes WideToASCII and changes all callers to use UTF16ToASCII instead.
Moves UTF16ToASCII from base/strings/string_util.h to base/strings/utf_string_conversions.h and into the base namespace.
Convert a few related string_util functions to take a StringPiece16 instead of a string16. Remove IsStringASCII(std::wstring) which was unused.
Updates callers' includes and namespace usage accordingly.
TBR=sky
Review URL: https://codereview.chromium.org/176843022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_resolver_winhttp.cc')
| -rw-r--r-- | net/proxy/proxy_resolver_winhttp.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/proxy/proxy_resolver_winhttp.cc b/net/proxy/proxy_resolver_winhttp.cc index 116b33c..2d90dab 100644 --- a/net/proxy/proxy_resolver_winhttp.cc +++ b/net/proxy/proxy_resolver_winhttp.cc @@ -108,7 +108,7 @@ int ProxyResolverWinHttp::GetProxyForURL(const GURL& query_url, // things like "foopy1:80;foopy2:80". It strips out the non-HTTP // proxy types, and stops the list when PAC encounters a "DIRECT". // So UseNamedProxy() should work OK. - results->UseNamedProxy(WideToASCII(info.lpszProxy)); + results->UseNamedProxy(base::UTF16ToASCII(info.lpszProxy)); break; default: NOTREACHED(); |