diff options
| author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 18:24:42 +0000 |
|---|---|---|
| committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 18:24:42 +0000 |
| commit | 78a01fbecaf1339bb37162bf77a076073b9e22de (patch) | |
| tree | d5cf016e7c382ec1a8ec090f2f45131de88fd7d3 /chrome/nacl/nacl_fork_delegate_linux.cc | |
| parent | d323a176fa8c2ef474ce41dd8a1cddacb4fc67ff (diff) | |
| download | chromium_src-78a01fbecaf1339bb37162bf77a076073b9e22de.zip chromium_src-78a01fbecaf1339bb37162bf77a076073b9e22de.tar.gz chromium_src-78a01fbecaf1339bb37162bf77a076073b9e22de.tar.bz2 | |
Disable nacl_helper while fixing DCHECK issue.
TBR=mcgrathr
BUG=
TEST=
Review URL: http://codereview.chromium.org/7831046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99410 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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/nacl/nacl_fork_delegate_linux.cc b/chrome/nacl/nacl_fork_delegate_linux.cc index 1138350..6623846 100644 --- a/chrome/nacl/nacl_fork_delegate_linux.cc +++ b/chrome/nacl/nacl_fork_delegate_linux.cc @@ -46,6 +46,8 @@ 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) && |