| Index: base/trace_event/memory_dump_manager.cc
|
| diff --git a/base/trace_event/memory_dump_manager.cc b/base/trace_event/memory_dump_manager.cc
|
| index f76ac55a69bdacc58dabb4d1af8113687c968a52..bafd121af1e461cc246c3664d6b269079c9b752d 100644
|
| --- a/base/trace_event/memory_dump_manager.cc
|
| +++ b/base/trace_event/memory_dump_manager.cc
|
| @@ -119,7 +119,14 @@ void MemoryDumpManager::Initialize() {
|
| #endif
|
|
|
| #if defined(OS_LINUX) || defined(OS_ANDROID)
|
| - RegisterDumpProvider(ProcessMemoryMapsDumpProvider::GetInstance());
|
| + // The memory maps dump provider is currently disabled for security reasons
|
| + // and will be enabled once tracing is more secure (crbug.com/517906).
|
| + // It is still enabled for running benchmarks.
|
| + if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| + "enable-memory-benchmarking")) {
|
| + RegisterDumpProvider(ProcessMemoryMapsDumpProvider::GetInstance());
|
| + }
|
| +
|
| RegisterDumpProvider(MallocDumpProvider::GetInstance());
|
| system_allocator_pool_name_ = MallocDumpProvider::kAllocatedObjects;
|
| #endif
|
|
|