| 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 cd1503b51952634ed8b19475c8176da4c151a3fc..4a464508fb43ba0b08c81c83e76177f697521e68 100644
|
| --- a/base/trace_event/memory_dump_manager.cc
|
| +++ b/base/trace_event/memory_dump_manager.cc
|
| @@ -116,14 +116,7 @@ void MemoryDumpManager::Initialize() {
|
| #endif
|
|
|
| #if defined(OS_LINUX) || defined(OS_ANDROID)
|
| - // 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(ProcessMemoryMapsDumpProvider::GetInstance());
|
| RegisterDumpProvider(MallocDumpProvider::GetInstance());
|
| system_allocator_pool_name_ = MallocDumpProvider::kAllocatedObjects;
|
| #endif
|
|
|