Net: Convert username and password to string16.

net/base/net_util.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/net_util.h"
 
 #include <algorithm>
 #include <map>
 #include <unicode/regex.h>
 #include <unicode/ucnv.h>
@@ skipping 1320 matching lines @@
   char buffer[256];
   int result = gethostname(buffer, sizeof(buffer));
   if (result != 0) {
     DLOG(INFO) << "gethostname() failed with " << result;
     buffer[0] = '\0';
   }
   return std::string(buffer);
 }
 
 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) {
   return url.has_host() ? net::TrimEndingDot(url.host()) : url.spec();
 }
 
 void AppendFormattedHost(const GURL& url,
                          const std::wstring& languages,
                          std::wstring* output,
                          url_parse::Parsed* new_parsed,
@@ skipping 605 matching lines @@
 }
 
 int GetPortFromAddrinfo(const struct addrinfo* info) {
   uint16* port_field = GetPortFieldFromAddrinfo(info);
   if (!port_field)
     return -1;
   return ntohs(*port_field);
 }
 
 }  // namespace net