| 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 f439e0690da19ffecebbc5912d838b969e6ed791..319ea14481abd2e23afea7265f40c5e6e4b6ce9a 100644
|
| --- a/content/browser/zygote_host/zygote_host_impl_linux.cc
|
| +++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
|
| @@ -11,6 +11,7 @@
|
| #include <sys/types.h>
|
| #include <unistd.h>
|
|
|
| +#include "base/allocator/allocator_extension.h"
|
| #include "base/base_switches.h"
|
| #include "base/command_line.h"
|
| #include "base/environment.h"
|
| @@ -49,10 +50,6 @@
|
| #include "ui/base/ui_base_switches.h"
|
| #include "ui/gfx/switches.h"
|
|
|
| -#if defined(USE_TCMALLOC)
|
| -#include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
|
| -#endif
|
| -
|
| namespace content {
|
|
|
| namespace {
|
| @@ -484,13 +481,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);
|
|
|