De-wstringify some browser startup code.

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 1620 matching lines @@
   DCHECK(url.is_valid());
   GURL::Replacements replacements;
   replacements.ClearUsername();
   replacements.ClearPassword();
   replacements.ClearRef();
   return url.ReplaceComponents(replacements);
 }
 
 // Specifies a comma separated list of port numbers that should be accepted
 // despite bans. If the string is invalid no allowed ports are stored.
-void SetExplicitlyAllowedPorts(const std::wstring& allowed_ports) {
+void SetExplicitlyAllowedPorts(const std::string& allowed_ports) {
   if (allowed_ports.empty())
     return;
 
   std::set<int> ports;
   size_t last = 0;
   size_t size = allowed_ports.size();
   // The comma delimiter.
-  const std::wstring::value_type kComma = L',';
+  const std::string::value_type kComma = ',';
 
   // Overflow is still possible for evil user inputs.
   for (size_t i = 0; i <= size; ++i) {
     // The string should be composed of only digits and commas.
     if (i != size && !IsAsciiDigit(allowed_ports[i]) &&
         (allowed_ports[i] != kComma))
       return;
     if (i == size || allowed_ports[i] == kComma) {
       size_t length = i - last;
       if (length > 0) {
         int port;
-        base::StringToInt(WideToUTF8(allowed_ports.substr(last, length)),
-                          &port);
+        base::StringToInt(allowed_ports.substr(last, length), &port);
         ports.insert(port);
       }
       last = i + 1;
     }
   }
   explicitly_allowed_ports = ports;
 }
 
 enum IPv6SupportStatus {
   IPV6_CANNOT_CREATE_SOCKETS,
@@ skipping 288 matching lines @@
 }
 
 int GetPortFromAddrinfo(const struct addrinfo* info) {
   uint16* port_field = GetPortFieldFromAddrinfo(info);
   if (!port_field)
     return -1;
   return ntohs(*port_field);
 }
 
 }  // namespace net