| 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 2cddc5f43204ac0468c104721640176837e4fed5..3e4d656f6ed6cd93348bb2b1309d264685ea9c55 100644
|
| --- a/base/trace_event/memory_dump_manager.cc
|
| +++ b/base/trace_event/memory_dump_manager.cc
|
| @@ -21,14 +21,6 @@
|
| #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
|
| @@ -155,20 +147,10 @@ void MemoryDumpManager::Initialize(MemoryDumpManagerDelegate* delegate,
|
| }
|
|
|
| // 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)
|
| RegisterDumpProvider(JavaHeapDumpProvider::GetInstance(), "JavaHeap",
|
| nullptr);
|
|
|