Get rid of wstring variants of StringToFoo.

chrome/browser/browser_init.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/browser_init.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/event_recorder.h"
 #include "base/histogram.h"
@@ skipping 199 matching lines @@
   if (command_line_.HasSwitch(switches::kDnsPrefetchDisable))
     chrome_browser_net::EnableDnsPrefetch(false);
 
   if (command_line_.HasSwitch(switches::kDumpHistogramsOnExit))
     StatisticsRecorder::set_dump_on_exit(true);
 
   if (command_line_.HasSwitch(switches::kRemoteShellPort)) {
     if (!RenderProcessHost::run_renderer_in_process()) {
       std::wstring port_str =
           command_line_.GetSwitchValue(switches::kRemoteShellPort);
-      int64 port = StringToInt64(port_str);
+      int64 port = StringToInt64(WideToUTF16Hack(port_str));
       if (port > 0 && port < 65535) {
         g_browser_process->InitDebuggerWrapper(static_cast<int>(port));
       } else {
         DLOG(WARNING) << "Invalid port number " << port;
       }
     }
   }
 
   if (command_line_.HasSwitch(switches::kEnableFileCookies))
     net::CookieMonster::EnableFileScheme();
@@ skipping 183 matching lines @@
 bool BrowserInit::ProcessCommandLine(
     const CommandLine& command_line, const std::wstring& cur_dir,
     PrefService* prefs, bool process_startup, Profile* profile,
     int* return_code) {
   DCHECK(profile);
   if (process_startup) {
     const std::wstring popup_count_string =
         command_line.GetSwitchValue(switches::kOmniBoxPopupCount);
     if (!popup_count_string.empty()) {
       int count = 0;
-      if (StringToInt(popup_count_string, &count)) {
+      if (StringToInt(WideToUTF16Hack(popup_count_string), &count)) {
         const int popup_count = std::max(0, count);
         AutocompleteResult::set_max_matches(popup_count);
         AutocompleteProvider::set_max_matches(popup_count / 2);
       }
     }
 
     if (command_line.HasSwitch(switches::kDisablePromptOnRepost))
       NavigationController::DisablePromptOnRepost();
 
     const std::wstring tab_count_string =
         command_line.GetSwitchValue(switches::kTabCountToLoadOnSessionRestore);
     if (!tab_count_string.empty()) {
       int count = 0;
-      if (StringToInt(tab_count_string, &count)) {
+      if (StringToInt(WideToUTF16Hack(tab_count_string), &count)) {
         const int tab_count = std::max(0, count);
         SessionRestore::num_tabs_to_load_ = static_cast<size_t>(tab_count);
       }
     }
 
 #if defined(OS_WIN)
     // Look for the testing channel ID ONLY during process startup
     if (command_line.HasSwitch(switches::kTestingChannelID)) {
       std::wstring testing_channel_id =
           command_line.GetSwitchValue(switches::kTestingChannelID);
@@ skipping 109 matching lines @@
   bool launched = lwp.Launch(profile, process_startup);
   if (!launched) {
     LOG(ERROR) << "launch error";
     if (return_code != NULL)
       *return_code = ResultCodes::INVALID_CMDLINE_URL;
     return false;
   }
 
   return true;
 }