| 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 e40d2dadf6e5dfc601cb53ab7a7c44555f8e5c57..7e992b96768b3cdcf126bf97305a881504006b29 100644
|
| --- a/base/trace_event/memory_dump_manager.cc
|
| +++ b/base/trace_event/memory_dump_manager.cc
|
| @@ -150,20 +150,22 @@ void MemoryDumpManager::Initialize(MemoryDumpManagerDelegate* delegate,
|
|
|
| // Enable the core dump providers.
|
| #if !defined(OS_NACL)
|
| - RegisterDumpProvider(ProcessMemoryTotalsDumpProvider::GetInstance());
|
| + RegisterDumpProvider(ProcessMemoryTotalsDumpProvider::GetInstance(),
|
| + "ProcessMemoryTotals");
|
| #endif
|
|
|
| #if defined(OS_LINUX) || defined(OS_ANDROID)
|
| - RegisterDumpProvider(ProcessMemoryMapsDumpProvider::GetInstance());
|
| - RegisterDumpProvider(MallocDumpProvider::GetInstance());
|
| + RegisterDumpProvider(ProcessMemoryMapsDumpProvider::GetInstance(),
|
| + "ProcessMemoryMaps");
|
| + RegisterDumpProvider(MallocDumpProvider::GetInstance(), "Malloc");
|
| #endif
|
|
|
| #if defined(OS_ANDROID)
|
| - RegisterDumpProvider(JavaHeapDumpProvider::GetInstance());
|
| + RegisterDumpProvider(JavaHeapDumpProvider::GetInstance(), "JavaHeap");
|
| #endif
|
|
|
| #if defined(OS_WIN)
|
| - RegisterDumpProvider(WinHeapDumpProvider::GetInstance());
|
| + RegisterDumpProvider(WinHeapDumpProvider::GetInstance(), "WinHeap");
|
| #endif
|
|
|
| // If tracing was enabled before initializing MemoryDumpManager, we missed the
|
| @@ -199,14 +201,9 @@ void MemoryDumpManager::RegisterDumpProvider(
|
| mdp->OnHeapProfilingEnabled(true);
|
| }
|
|
|
| -void MemoryDumpManager::RegisterDumpProvider(
|
| - MemoryDumpProvider* mdp,
|
| - const scoped_refptr<SingleThreadTaskRunner>& task_runner) {
|
| - RegisterDumpProvider(mdp, "unknown", task_runner);
|
| -}
|
| -
|
| -void MemoryDumpManager::RegisterDumpProvider(MemoryDumpProvider* mdp) {
|
| - RegisterDumpProvider(mdp, nullptr);
|
| +void MemoryDumpManager::RegisterDumpProvider(MemoryDumpProvider* mdp,
|
| + const char* name) {
|
| + RegisterDumpProvider(mdp, name, nullptr);
|
| }
|
|
|
| void MemoryDumpManager::UnregisterDumpProvider(MemoryDumpProvider* mdp) {
|
|
|