3 files changed, 7 insertions, 6 deletions
diff --git a/chrome/app/breakpad_linux.cc b/chrome/app/breakpad_linux.cc
index 22f69f9..59dedb9 100644
--- a/chrome/app/breakpad_linux.cc
+++ b/chrome/app/breakpad_linux.cc
@@ -752,8 +752,8 @@ void InitCrashReporter() {
     if (!parsed_command_line.HasSwitch(switches::kEnableCrashReporter))
       return;
     // Get the guid and linux distro from the command line switch.
-    std::string switch_value = WideToASCII(
-        parsed_command_line.GetSwitchValue(switches::kEnableCrashReporter));
+    std::string switch_value =
+        parsed_command_line.GetSwitchValueASCII(switches::kEnableCrashReporter);
     size_t separator = switch_value.find(",");
     if (separator != std::string::npos) {
       google_update::posix_guid = switch_value.substr(0, separator);
diff --git a/chrome/app/breakpad_mac.mm b/chrome/app/breakpad_mac.mm
index a7d580d..f96327c 100644
--- a/chrome/app/breakpad_mac.mm
+++ b/chrome/app/breakpad_mac.mm
@@ -168,10 +168,11 @@ void InitCrashProcessInfo() {
 
   // Determine the process type.
   NSString* process_type = @"browser";
-  std::wstring process_type_switch =
-      CommandLine::ForCurrentProcess()->GetSwitchValue(switches::kProcessType);
+  std::string process_type_switch =
+      CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kProcessType);
   if (!process_type_switch.empty()) {
-    process_type = base::SysWideToNSString(process_type_switch);
+    process_type = base::SysUTF8ToNSString(process_type_switch);
   }
 
   // Store process type in crash dump.
diff --git a/chrome/app/breakpad_win.cc b/chrome/app/breakpad_win.cc
index efb5b3e..a21f5b5 100644
--- a/chrome/app/breakpad_win.cc
+++ b/chrome/app/breakpad_win.cc
@@ -526,7 +526,7 @@ void InitCrashReporterWithDllPath(const std::wstring& dll_path) {
     // Query the custom_info now because if we do it in the thread it's going to
     // fail in the sandbox. The thread will delete this object.
     CrashReporterInfo* info(new CrashReporterInfo);
-    info->process_type = command.GetSwitchValue(switches::kProcessType);
+    info->process_type = command.GetSwitchValueNative(switches::kProcessType);
     if (info->process_type.empty())
       info->process_type = L"browser";