| Index: chrome/browser/zygote_host_linux.cc
|
| diff --git a/chrome/browser/zygote_host_linux.cc b/chrome/browser/zygote_host_linux.cc
|
| index 2828e3e2a7ec3995c1f7dea765bdc863c7be71c5..7adee51f67ed71f8398c98e9d002889e43dc14b6 100644
|
| --- a/chrome/browser/zygote_host_linux.cc
|
| +++ b/chrome/browser/zygote_host_linux.cc
|
| @@ -81,9 +81,8 @@ void ZygoteHost::Init(const std::string& sandbox_cmd) {
|
|
|
| const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
|
| if (browser_command_line.HasSwitch(switches::kZygoteCmdPrefix)) {
|
| - const std::wstring prefix =
|
| - browser_command_line.GetSwitchValue(switches::kZygoteCmdPrefix);
|
| - cmd_line.PrependWrapper(prefix);
|
| + cmd_line.PrependWrapper(
|
| + browser_command_line.GetSwitchValueNative(switches::kZygoteCmdPrefix));
|
| }
|
| // Append any switches from the browser process that need to be forwarded on
|
| // to the zygote/renderers.
|
| @@ -113,7 +112,7 @@ void ZygoteHost::Init(const std::string& sandbox_cmd) {
|
| (st.st_mode & S_ISUID) &&
|
| (st.st_mode & S_IXOTH)) {
|
| using_suid_sandbox_ = true;
|
| - cmd_line.PrependWrapper(ASCIIToWide(sandbox_binary_.c_str()));
|
| + cmd_line.PrependWrapper(sandbox_binary_);
|
|
|
| SaveSUIDUnsafeEnvironmentVariables();
|
| } else {
|
|
|