| Index: net/http/http_auth_handler_ntlm_portable.cc
|
| diff --git a/net/http/http_auth_handler_ntlm_portable.cc b/net/http/http_auth_handler_ntlm_portable.cc
|
| index 9faa85fde199e451781fbd6233abd5ff861287c4..138e2881093bbc0fd33c454fa1badba48c00f0ac 100644
|
| --- a/net/http/http_auth_handler_ntlm_portable.cc
|
| +++ b/net/http/http_auth_handler_ntlm_portable.cc
|
| @@ -211,7 +211,8 @@ static void* WriteSecBuf(void* buf, uint16 length, uint32 offset) {
|
| * to pass the same buffer as both input and output, which is a handy way to
|
| * convert the unicode buffer to little-endian on big-endian platforms.
|
| */
|
| -static void* WriteUnicodeLE(void* buf, const char16* str, uint32 str_len) {
|
| +static void* WriteUnicodeLE(
|
| + void* buf, const base::char16* str, uint32 str_len) {
|
| // Convert input string from BE to LE.
|
| uint8* cursor = static_cast<uint8*>(buf);
|
| const uint8* input = reinterpret_cast<const uint8*>(str);
|
| @@ -480,7 +481,8 @@ static int GenerateType3Msg(const base::string16& domain,
|
| ucs_domain_buf = domain;
|
| domain_ptr = ucs_domain_buf.data();
|
| domain_len = ucs_domain_buf.length() * 2;
|
| - WriteUnicodeLE(const_cast<void*>(domain_ptr), (const char16*) domain_ptr,
|
| + WriteUnicodeLE(const_cast<void*>(domain_ptr),
|
| + (const base::char16*) domain_ptr,
|
| ucs_domain_buf.length());
|
| #else
|
| domain_ptr = domain.data();
|
| @@ -500,7 +502,7 @@ static int GenerateType3Msg(const base::string16& domain,
|
| ucs_user_buf = username;
|
| user_ptr = ucs_user_buf.data();
|
| user_len = ucs_user_buf.length() * 2;
|
| - WriteUnicodeLE(const_cast<void*>(user_ptr), (const char16*) user_ptr,
|
| + WriteUnicodeLE(const_cast<void*>(user_ptr), (const base::char16*) user_ptr,
|
| ucs_user_buf.length());
|
| #else
|
| user_ptr = username.data();
|
| @@ -521,7 +523,7 @@ static int GenerateType3Msg(const base::string16& domain,
|
| host_ptr = ucs_host_buf.data();
|
| host_len = ucs_host_buf.length() * 2;
|
| #ifdef IS_BIG_ENDIAN
|
| - WriteUnicodeLE(const_cast<void*>(host_ptr), (const char16*) host_ptr,
|
| + WriteUnicodeLE(const_cast<void*>(host_ptr), (const base::char16*) host_ptr,
|
| ucs_host_buf.length());
|
| #endif
|
| } else {
|
|
|