| Index: content/browser/zygote_host/zygote_host_impl_linux.cc
|
| diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc
|
| index 8b5ad762dca33a140c467b5b4bca838f70aa4c12..f61d81382f1e354942d9b9e03a033c1aa59a1d0c 100644
|
| --- a/content/browser/zygote_host/zygote_host_impl_linux.cc
|
| +++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "content/browser/zygote_host/zygote_host_impl_linux.h"
|
|
|
| +#include "base/allocator/allocator_extension.h"
|
| #include "base/files/file_enumerator.h"
|
| #include "base/process/kill.h"
|
| #include "base/process/memory.h"
|
| @@ -11,10 +12,6 @@
|
| #include "content/public/browser/content_browser_client.h"
|
| #include "sandbox/linux/suid/common/sandbox.h"
|
|
|
| -#if defined(USE_TCMALLOC)
|
| -#include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
|
| -#endif
|
| -
|
| namespace content {
|
|
|
| // static
|
| @@ -104,13 +101,12 @@ void ZygoteHostImpl::AdjustRendererOOMScore(base::ProcessHandle pid,
|
| }
|
|
|
| if (use_suid_sandbox_for_adj_oom_score_ && !selinux) {
|
| -#if defined(USE_TCMALLOC)
|
| // If heap profiling is running, these processes are not exiting, at least
|
| // on ChromeOS. The easiest thing to do is not launch them when profiling.
|
| // TODO(stevenjb): Investigate further and fix.
|
| - if (IsHeapProfilerRunning())
|
| + if (base::allocator::IsHeapProfilerRunning())
|
| return;
|
| -#endif
|
| +
|
| std::vector<std::string> adj_oom_score_cmdline;
|
| adj_oom_score_cmdline.push_back(sandbox_binary_);
|
| adj_oom_score_cmdline.push_back(sandbox::kAdjustOOMScoreSwitch);
|
|
|