diff options
| author | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 09:36:51 +0000 |
|---|---|---|
| committer | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 09:36:51 +0000 |
| commit | 24e1b1e81cecbc047791bc70ae5537b0fb294580 (patch) | |
| tree | 5bd337e197eb3d79c21cc581dcb9e009edecf6e5 /chrome/nacl | |
| parent | 21d4e5c22bb0ac6fd955736136c685551acd81e5 (diff) | |
| download | chromium_src-24e1b1e81cecbc047791bc70ae5537b0fb294580.zip chromium_src-24e1b1e81cecbc047791bc70ae5537b0fb294580.tar.gz chromium_src-24e1b1e81cecbc047791bc70ae5537b0fb294580.tar.bz2 | |
Don't use NaCl helper when run under Valgrind
TBR=bradchen,eugenis
TEST=Valgrind bots go greener
BUG=95171
Review URL: http://codereview.chromium.org/7792096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
| -rw-r--r-- | chrome/nacl/nacl_fork_delegate_linux.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/nacl/nacl_fork_delegate_linux.cc b/chrome/nacl/nacl_fork_delegate_linux.cc index 93b0a84..1138350 100644 --- a/chrome/nacl/nacl_fork_delegate_linux.cc +++ b/chrome/nacl/nacl_fork_delegate_linux.cc @@ -15,6 +15,7 @@ #include "base/file_path.h" #include "base/path_service.h" #include "base/process_util.h" +#include "base/third_party/dynamic_annotations/dynamic_annotations.h" #include "content/common/unix_domain_socket_posix.h" #include "content/common/zygote_fork_delegate_linux.h" #include "chrome/common/chrome_paths.h" @@ -49,7 +50,8 @@ void NaClForkDelegate::Init(const bool sandboxed, FilePath helper_bootstrap_exe; if (PathService::Get(chrome::FILE_NACL_HELPER, &helper_exe) && PathService::Get(chrome::FILE_NACL_HELPER_BOOTSTRAP, - &helper_bootstrap_exe)) { + &helper_bootstrap_exe) && + !RunningOnValgrind()) { CommandLine::StringVector argv = CommandLine::ForCurrentProcess()->argv(); argv[0] = helper_bootstrap_exe.value(); argv[1] = helper_exe.value(); |