De-wstringify some browser startup code.

chrome/app/chrome_dll_main.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.
 
 // TODO(port): the ifdefs in here are a first step towards trying to determine
 // the correct abstraction for all the OS functionality required at this
 // stage of process initialization. It should not be taken as a final
 // abstraction.
 
 #include "build/build_config.h"
@@ skipping 314 matching lines @@
   _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
 #else
   if (!parsed_command_line.HasSwitch(switches::kDisableBreakpad)) {
     _CrtSetReportMode(_CRT_ASSERT, 0);
   }
 #endif
 
   // Enable the low fragmentation heap for the CRT heap. The heap is not changed
   // if the process is run under the debugger is enabled or if certain gflags
   // are set.
-  bool use_lfh = false;
-  if (parsed_command_line.HasSwitch(switches::kUseLowFragHeapCrt))
-    use_lfh = parsed_command_line.GetSwitchValue(switches::kUseLowFragHeapCrt)
-        != L"false";
-  if (use_lfh) {
+  if (parsed_command_line.HasSwitch(switches::kUseLowFragHeapCrt) &&
+      (parsed_command_line.GetSwitchValueASCII(switches::kUseLowFragHeapCrt)
+       != "false")) {
     void* crt_heap = reinterpret_cast<void*>(_get_heap_handle());
     ULONG enable_lfh = 2;
     HeapSetInformation(crt_heap, HeapCompatibilityInformation,
                        &enable_lfh, sizeof(enable_lfh));
   }
 #endif
 }
 
 // Enable the heap profiler if the appropriate command-line switch is
 // present, bailing out of the app we can't.
@@ skipping 224 matching lines @@
     // Disable sync and extensions if we're in "browse without sign-in" mode.
     CommandLine* singleton_command_line = CommandLine::ForCurrentProcess();
     singleton_command_line->AppendSwitch(switches::kDisableSync);
     singleton_command_line->AppendSwitch(switches::kDisableExtensions);
   }
 #endif
 
   base::ProcessId browser_pid = base::GetCurrentProcId();
   if (SubprocessIsBrowserChild(process_type)) {
 #if defined(OS_WIN)
-    std::wstring channel_name =
-      parsed_command_line.GetSwitchValue(switches::kProcessChannelID);
+    std::string channel_name =
+        parsed_command_line.GetSwitchValueASCII(switches::kProcessChannelID);
 
     int browser_pid_int;
-    base::StringToInt(WideToUTF8(channel_name), &browser_pid_int);
+    base::StringToInt(channel_name, &browser_pid_int);
     browser_pid = static_cast<base::ProcessId>(browser_pid_int);
     DCHECK_NE(browser_pid, 0u);
 #elif defined(OS_MACOSX)
     browser_pid = base::GetCurrentProcId();
 #elif defined(OS_POSIX)
     // On linux, we're in the zygote here; so we need the parent process' id.
     browser_pid = base::GetParentProcessId(base::GetCurrentProcId());
 #endif
 
 #if defined(OS_POSIX)
@@ skipping 138 matching lines @@
     // sources.  The language should have been passed in to us from the
     // browser process as a command line flag.
     DCHECK(parsed_command_line.HasSwitch(switches::kLang) ||
            process_type == switches::kZygoteProcess);
 
     // TODO(markusheintz): The command line flag --lang is actually processed
     // by the CommandLinePrefStore, and made available through the PrefService
     // via the preference prefs::kApplicationLocale. The browser process uses
     // the --lang flag to passe the value of the PrefService in here. Maybe this
     // value could be passed in a different way.
-    ResourceBundle::InitSharedInstance(
-        parsed_command_line.GetSwitchValue(switches::kLang));
+    ResourceBundle::InitSharedInstance(ASCIIToWide(
+        parsed_command_line.GetSwitchValueASCII(switches::kLang)));
 
 #if defined(OS_MACOSX)
     // Update the process name (need resources to get the strings, so
     // only do this when ResourcesBundle has been initialized).
     SetMacProcessName(process_type);
 #endif  // defined(OS_MACOSX)
   }
 
   if (!process_type.empty())
     CommonSubprocessInit();
@@ skipping 157 matching lines @@
 
   logging::CleanupChromeLogging();
 
 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD)
   // TODO(mark): See the TODO(mark) above at InitCrashReporter.
   DestructCrashReporter();
 #endif  // OS_MACOSX && GOOGLE_CHROME_BUILD
 
   return rv;
 }