diff options
| author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 02:28:27 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 02:28:27 +0000 |
| commit | d4c59549ca9fdfc510462ef5a8fdca20526896f7 (patch) | |
| tree | 8a2a15725eedc01826149da3e0a57cdd2ae91cc5 /chrome/nacl/nacl_fork_delegate_linux.cc | |
| parent | 434976f03ea2ddc6dd338d11635ab850e82556ef (diff) | |
| download | chromium_src-d4c59549ca9fdfc510462ef5a8fdca20526896f7.zip chromium_src-d4c59549ca9fdfc510462ef5a8fdca20526896f7.tar.gz chromium_src-d4c59549ca9fdfc510462ef5a8fdca20526896f7.tar.bz2 | |
Revert 99617 - Fix nacl_helper startup bug with command line construction.
Add proper chrome dependencies. Re-enable nacl_helper.
BUG=92964,nativeclient:480,95168
TEST=nacl_integration tests on bots
Review URL: http://codereview.chromium.org/7833017
TBR=bradchen@google.com
Review URL: http://codereview.chromium.org/7779029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl/nacl_fork_delegate_linux.cc')
| -rw-r--r-- | chrome/nacl/nacl_fork_delegate_linux.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/nacl/nacl_fork_delegate_linux.cc b/chrome/nacl/nacl_fork_delegate_linux.cc index 828cb6e..6623846 100644 --- a/chrome/nacl/nacl_fork_delegate_linux.cc +++ b/chrome/nacl/nacl_fork_delegate_linux.cc @@ -46,19 +46,22 @@ void NaClForkDelegate::Init(const bool sandboxed, fds_to_map.push_back(std::make_pair(fds[1], kNaClZygoteDescriptor)); fds_to_map.push_back(std::make_pair(sandboxdesc, kNaClSandboxDescriptor)); ready_ = false; + return; // Disable nacl_helper while fixing some issues. + FilePath helper_exe; FilePath helper_bootstrap_exe; if (PathService::Get(chrome::FILE_NACL_HELPER, &helper_exe) && PathService::Get(chrome::FILE_NACL_HELPER_BOOTSTRAP, &helper_bootstrap_exe) && !RunningOnValgrind()) { - CommandLine cmd_line(helper_bootstrap_exe); - cmd_line.AppendArgPath(helper_exe); - cmd_line.AppendArgNative(kNaClHelperAtZero); + CommandLine::StringVector argv = CommandLine::ForCurrentProcess()->argv(); + argv[0] = helper_bootstrap_exe.value(); + argv[1] = helper_exe.value(); + argv[2] = kNaClHelperAtZero; base::LaunchOptions options; options.fds_to_remap = &fds_to_map; options.clone_flags = CLONE_FS | SIGCHLD; - ready_ = base::LaunchProcess(cmd_line.argv(), options, NULL); + ready_ = base::LaunchProcess(argv, options, NULL); // parent and error cases are handled below } if (HANDLE_EINTR(close(fds[1])) != 0) |