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..538b59b966df4e4f4b56f9360de1078c652f6868 100644 |
--- a/base/trace_event/memory_dump_manager.cc |
+++ b/base/trace_event/memory_dump_manager.cc |
@@ -115,7 +115,11 @@ void MemoryDumpManager::Initialize() { |
// Enable the core dump providers. |
#if !defined(OS_NACL) |
- RegisterDumpProvider(ProcessMemoryTotalsDumpProvider::GetInstance()); |
+ // The memory maps dump provider is currently disabled for security reasons |
+ // and will be enabled once tracing is more secure. It is still enabled for |
+ // running benchmarks. |
+ if (CommandLine::ForCurrentProcess()->HasSwitch("enable-memory-benchmarking")) |
+ RegisterDumpProvider(ProcessMemoryTotalsDumpProvider::GetInstance()); |
#endif |
#if defined(OS_LINUX) || defined(OS_ANDROID) |