De-wstringify some browser startup code and net utility.

Review URL: http://codereview.chromium.org/3054042

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

3 files changed, 6 insertions, 7 deletions

diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index 1d903b8..a125664 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -1638,7 +1638,7 @@ GURL SimplifyUrlForRequest(const GURL& url) {
 
 // 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;
 
@@ -1646,7 +1646,7 @@ void SetExplicitlyAllowedPorts(const std::wstring& allowed_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) {
@@ -1658,8 +1658,7 @@ void SetExplicitlyAllowedPorts(const std::wstring& allowed_ports) {
       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;
diff --git a/net/base/net_util.h b/net/base/net_util.h
index 44bda41..7815146 100644
--- a/net/base/net_util.h
+++ b/net/base/net_util.h
@@ -321,7 +321,7 @@ bool CanStripTrailingSlash(const GURL& url);
 //   - reference section
 GURL SimplifyUrlForRequest(const GURL& url);
 
-void SetExplicitlyAllowedPorts(const std::wstring& allowed_ports);
+void SetExplicitlyAllowedPorts(const std::string& allowed_ports);
 
 // Perform a simplistic test to see if IPv6 is supported by trying to create an
 // IPv6 socket.
diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc
index 98e2b05..67cc03e 100644
--- a/net/base/net_util_unittest.cc
+++ b/net/base/net_util_unittest.cc
@@ -1846,8 +1846,8 @@ TEST(NetUtilTest, SimplifyUrlForRequest) {
 }
 
 TEST(NetUtilTest, SetExplicitlyAllowedPortsTest) {
-  std::wstring invalid[] = { L"1,2,a", L"'1','2'", L"1, 2, 3", L"1 0,11,12" };
-  std::wstring valid[] = { L"", L"1", L"1,2", L"1,2,3", L"10,11,12,13" };
+  std::string invalid[] = { "1,2,a", "'1','2'", "1, 2, 3", "1 0,11,12" };
+  std::string valid[] = { "", "1", "1,2", "1,2,3", "10,11,12,13" };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(invalid); ++i) {
     net::SetExplicitlyAllowedPorts(invalid[i]);