Commit a302a709 authored by Mostyn Bramley-Moore's avatar Mostyn Bramley-Moore Committed by Commit Bot

remove valgrind checks from //components/nacl/zygote

We have not supported valgrind for some time (it was never ported to
the GN build IIUC, and has been obsoleted by ASan/MSan/TSan).

BUG=791518

Change-Id: I9d6f5125de817b9334b295a8a78589004bb08294
Reviewed-on: https://chromium-review.googlesource.com/809132
Commit-Queue: Mostyn Bramley-Moore <mostynb@vewd.com>
Reviewed-by: default avatarMark Seaborn <mseaborn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522051}
parent f4aa50d6
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include "base/process/kill.h" #include "base/process/kill.h"
#include "base/process/launch.h" #include "base/process/launch.h"
#include "base/strings/string_split.h" #include "base/strings/string_split.h"
#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "components/nacl/common/nacl_nonsfi_util.h" #include "components/nacl/common/nacl_nonsfi_util.h"
#include "components/nacl/common/nacl_paths.h" #include "components/nacl/common/nacl_paths.h"
...@@ -210,8 +209,6 @@ void NaClForkDelegate::Init(const int sandboxdesc, ...@@ -210,8 +209,6 @@ void NaClForkDelegate::Init(const int sandboxdesc,
!PathService::Get(nacl::FILE_NACL_HELPER_BOOTSTRAP, !PathService::Get(nacl::FILE_NACL_HELPER_BOOTSTRAP,
&helper_bootstrap_exe)) { &helper_bootstrap_exe)) {
status_ = kNaClHelperBootstrapMissing; status_ = kNaClHelperBootstrapMissing;
} else if (RunningOnValgrind()) {
status_ = kNaClHelperValgrind;
} else { } else {
base::CommandLine::StringVector argv_to_launch; base::CommandLine::StringVector argv_to_launch;
{ {
......
...@@ -59,7 +59,7 @@ class NaClForkDelegate : public content::ZygoteForkDelegate { ...@@ -59,7 +59,7 @@ class NaClForkDelegate : public content::ZygoteForkDelegate {
kNaClHelperUnused = 0, kNaClHelperUnused = 0,
kNaClHelperMissing = 1, kNaClHelperMissing = 1,
kNaClHelperBootstrapMissing = 2, kNaClHelperBootstrapMissing = 2,
kNaClHelperValgrind = 3, // kNaClHelperValgrind = 3, // Running in valgrind no longer supported.
kNaClHelperLaunchFailed = 4, kNaClHelperLaunchFailed = 4,
kNaClHelperAckFailed = 5, kNaClHelperAckFailed = 5,
kNaClHelperSuccess = 6, kNaClHelperSuccess = 6,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment