diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 19:58:57 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 19:58:57 +0000 |
| commit | 42cba2fb14b47a0c9463763b7c8c83f36d2fcef5 (patch) | |
| tree | ef873bab10a838d28cc81c0e927f156ee6b55b5e /net/http/http_auth_handler_ntlm_portable.cc | |
| parent | b82d265634ced5b6457dac631868e7270963fa7e (diff) | |
| download | chromium_src-42cba2fb14b47a0c9463763b7c8c83f36d2fcef5.zip chromium_src-42cba2fb14b47a0c9463763b7c8c83f36d2fcef5.tar.gz chromium_src-42cba2fb14b47a0c9463763b7c8c83f36d2fcef5.tar.bz2 | |
Convert net to use base::string16 instead of string16.
This is just a search-and-replace.
BUG=
Review URL: https://codereview.chromium.org/13329004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191432 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_auth_handler_ntlm_portable.cc')
| -rw-r--r-- | net/http/http_auth_handler_ntlm_portable.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/http/http_auth_handler_ntlm_portable.cc b/net/http/http_auth_handler_ntlm_portable.cc index de7ed86..491a299a6 100644 --- a/net/http/http_auth_handler_ntlm_portable.cc +++ b/net/http/http_auth_handler_ntlm_portable.cc @@ -252,7 +252,7 @@ static uint32 ReadUint32(const uint8*& buf) { // // Note: This function is not being used because our SendLM() function always // returns false. -static void LM_Hash(const string16& password, uint8* hash) { +static void LM_Hash(const base::string16& password, uint8* hash) { static const uint8 LM_MAGIC[] = "KGS!@#$%"; // Convert password to OEM character set. We'll just use the native @@ -277,7 +277,7 @@ static void LM_Hash(const string16& password, uint8* hash) { // null-terminated unicode password. // param hash // 16-byte result buffer -static void NTLM_Hash(const string16& password, uint8* hash) { +static void NTLM_Hash(const base::string16& password, uint8* hash) { #ifdef IS_BIG_ENDIAN uint32 len = password.length(); uint8* passbuf; @@ -438,9 +438,9 @@ static void GenerateRandom(uint8* output, size_t n) { } // Returns OK or a network error code. -static int GenerateType3Msg(const string16& domain, - const string16& username, - const string16& password, +static int GenerateType3Msg(const base::string16& domain, + const base::string16& username, + const base::string16& password, const std::string& hostname, const void* rand_8_bytes, const void* in_buf, @@ -460,9 +460,9 @@ static int GenerateType3Msg(const string16& domain, // Temporary buffers for unicode strings #ifdef IS_BIG_ENDIAN - string16 ucs_domain_buf, ucs_user_buf; + base::string16 ucs_domain_buf, ucs_user_buf; #endif - string16 ucs_host_buf; + base::string16 ucs_host_buf; // Temporary buffers for oem strings std::string oem_domain_buf, oem_user_buf; // Pointers and lengths for the string buffers; encoding is unicode if |