diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-29 06:15:44 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-29 06:15:44 +0000 |
| commit | 13c8a0903376ff406151679d8673a6452d721290 (patch) | |
| tree | dbb5b8e9503f8d0ee447863089f3e6f23692910f /net/base/net_util.cc | |
| parent | 6b55570f03236557b8b966b08dfbdda1ea91aadc (diff) | |
| download | chromium_src-13c8a0903376ff406151679d8673a6452d721290.zip chromium_src-13c8a0903376ff406151679d8673a6452d721290.tar.gz chromium_src-13c8a0903376ff406151679d8673a6452d721290.tar.bz2 | |
Net: Convert username and password to string16.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3040016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/net_util.cc')
| -rw-r--r-- | net/base/net_util.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 73df8c6..7ba8a10 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -1338,14 +1338,12 @@ std::string GetHostName() { } void GetIdentityFromURL(const GURL& url, - std::wstring* username, - std::wstring* password) { + string16* username, + string16* password) { UnescapeRule::Type flags = UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS; - *username = UTF16ToWideHack(UnescapeAndDecodeUTF8URLComponent(url.username(), - flags, NULL)); - *password = UTF16ToWideHack(UnescapeAndDecodeUTF8URLComponent(url.password(), - flags, NULL)); + *username = UnescapeAndDecodeUTF8URLComponent(url.username(), flags, NULL); + *password = UnescapeAndDecodeUTF8URLComponent(url.password(), flags, NULL); } std::string GetHostOrSpecFromURL(const GURL& url) { |