Update some uses of char16 to use the base:: namespace.

BUG=329295
TEST=no change
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/111373008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242507 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 13 insertions, 11 deletions

diff --git a/net/dns/dns_config_service_win.cc b/net/dns/dns_config_service_win.cc
index 15ae222..64b912d 100644
--- a/net/dns/dns_config_service_win.cc
+++ b/net/dns/dns_config_service_win.cc
@@ -146,7 +146,7 @@ bool ParseDomainASCII(const base::string16& widestr, std::string* domain) {
 
   // Otherwise try to convert it from IDN to punycode.
   const int kInitialBufferSize = 256;
-  url_canon::RawCanonOutputT<char16, kInitialBufferSize> punycode;
+  url_canon::RawCanonOutputT<base::char16, kInitialBufferSize> punycode;
   if (!url_canon::IDNToASCII(widestr.data(), widestr.length(), &punycode))
     return false;
 
diff --git a/net/http/http_auth_filter_win.h b/net/http/http_auth_filter_win.h
index 24305b5..d2c0af4 100644
--- a/net/http/http_auth_filter_win.h
+++ b/net/http/http_auth_filter_win.h
@@ -20,13 +20,13 @@ enum RegistryHiveType {
 namespace http_auth {
 
 // The common path to all the registry keys containing domain zone information.
-extern const char16 kRegistryInternetSettings[];
-extern const char16 kSettingsMachineOnly[];
-extern const char16* kRegistryEntries[3];       // L"http", L"https", and L"*"
+extern const base::char16 kRegistryInternetSettings[];
+extern const base::char16 kSettingsMachineOnly[];
+extern const base::char16* kRegistryEntries[3];  // L"http", L"https", and L"*"
 
-extern const char16* GetRegistryWhitelistKey();
+extern const base::char16* GetRegistryWhitelistKey();
 // Override the whitelist key.  Passing in NULL restores the default value.
-extern void SetRegistryWhitelistKey(const char16* new_whitelist_key);
+extern void SetRegistryWhitelistKey(const base::char16* new_whitelist_key);
 extern bool UseOnlyMachineSettings();
 
 }  // namespace http_auth
diff --git a/net/http/http_auth_handler_ntlm_portable.cc b/net/http/http_auth_handler_ntlm_portable.cc
index 9faa85f..138e288 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 {
diff --git a/net/proxy/proxy_resolver_v8.cc b/net/proxy/proxy_resolver_v8.cc
index 4571c4e..aab2432 100644
--- a/net/proxy/proxy_resolver_v8.cc
+++ b/net/proxy/proxy_resolver_v8.cc
@@ -223,7 +223,7 @@ bool GetHostnameArgument(const v8::FunctionCallbackInfo<v8::Value>& args,
 
   // Otherwise try to convert it from IDN to punycode.
   const int kInitialBufferSize = 256;
-  url_canon::RawCanonOutputT<char16, kInitialBufferSize> punycode_output;
+  url_canon::RawCanonOutputT<base::char16, kInitialBufferSize> punycode_output;
   if (!url_canon::IDNToASCII(hostname_utf16.data(),
                              hostname_utf16.length(),
                              &punycode_output)) {