Move std::string16 to base::string16. Don't pollute the std namespace. Don't

assume that all string types can be represented as std::basic_string<CHAR>.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index c558787..df012a2 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -568,7 +568,7 @@ bool IsIDNComponentSafe(const char16* str,
 void IDNToUnicodeOneComponent(const char16* comp,
                               int comp_len,
                               const std::wstring& languages,
-                              std::string16* out) {
+                              string16* out) {
   DCHECK(comp_len >= 0);
   if (comp_len == 0)
     return;
@@ -696,12 +696,12 @@ void IDNToUnicode(const char* host,
                   const std::wstring& languages,
                   std::wstring* out) {
   // Convert the ASCII input to a wide string for ICU.
-  std::string16 input16;
+  string16 input16;
   input16.reserve(host_len);
   for (int i = 0; i < host_len; i++)
     input16.push_back(host[i]);
 
-  std::string16 out16;
+  string16 out16;
   // The output string is appended to, so convert what's already there if
   // needed.
 #if defined(WCHAR_T_IS_UTF32)