| 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 bc3fbdfc96c64b2931892d95f2fb5eba8f5f0147..aa81e00a5da3c803fe24087fcde2ecf96186407f 100644
|
| --- a/base/trace_event/memory_dump_manager.cc
|
| +++ b/base/trace_event/memory_dump_manager.cc
|
| @@ -23,6 +23,14 @@
|
| #include "base/trace_event/trace_event_argument.h"
|
| #include "build/build_config.h"
|
|
|
| +#if !defined(OS_NACL)
|
| +#include "base/trace_event/process_memory_totals_dump_provider.h"
|
| +#endif
|
| +
|
| +#if defined(OS_LINUX) || defined(OS_ANDROID)
|
| +#include "base/trace_event/process_memory_maps_dump_provider.h"
|
| +#endif
|
| +
|
| #if defined(OS_ANDROID)
|
| #include "base/trace_event/java_heap_dump_provider_android.h"
|
| #endif
|
| @@ -145,8 +153,18 @@
|
| }
|
|
|
| // Enable the core dump providers.
|
| +#if !defined(OS_NACL)
|
| + RegisterDumpProvider(ProcessMemoryTotalsDumpProvider::GetInstance(),
|
| + "ProcessMemoryTotals", nullptr);
|
| +#endif
|
| +
|
| #if defined(MALLOC_MEMORY_TRACING_SUPPORTED)
|
| RegisterDumpProvider(MallocDumpProvider::GetInstance(), "Malloc", nullptr);
|
| +#endif
|
| +
|
| +#if defined(OS_LINUX) || defined(OS_ANDROID)
|
| + RegisterDumpProvider(ProcessMemoryMapsDumpProvider::GetInstance(),
|
| + "ProcessMemoryMaps", nullptr);
|
| #endif
|
|
|
| #if defined(OS_ANDROID)
|
|
|