| Index: base/trace_event/java_heap_dump_provider_android.cc
|
| diff --git a/base/trace_event/java_heap_dump_provider_android.cc b/base/trace_event/java_heap_dump_provider_android.cc
|
| index aa193ab78ea07cad19e027897fac2833302c8496..759bc0461ac9eac31afd3f6873759a0ef6afbda7 100644
|
| --- a/base/trace_event/java_heap_dump_provider_android.cc
|
| +++ b/base/trace_event/java_heap_dump_provider_android.cc
|
| @@ -12,7 +12,6 @@ namespace trace_event {
|
|
|
| namespace {
|
|
|
| -const char kDumperFriendlyName[] = "JavaHeap";
|
| const char kDumperName[] = "java_heap";
|
|
|
| } // namespace
|
| @@ -31,7 +30,7 @@ JavaHeapDumpProvider::~JavaHeapDumpProvider() {
|
|
|
| // Called at trace dump point time. Creates a snapshot with the memory counters
|
| // for the current process.
|
| -bool JavaHeapDumpProvider::DumpInto(ProcessMemoryDump* pmd) {
|
| +bool JavaHeapDumpProvider::OnMemoryDump(ProcessMemoryDump* pmd) {
|
| MemoryAllocatorDump* dump =
|
| pmd->CreateAllocatorDump(kDumperName, MemoryAllocatorDump::kRootHeap);
|
|
|
| @@ -45,9 +44,5 @@ bool JavaHeapDumpProvider::DumpInto(ProcessMemoryDump* pmd) {
|
| return true;
|
| }
|
|
|
| -const char* JavaHeapDumpProvider::GetFriendlyName() const {
|
| - return kDumperFriendlyName;
|
| -}
|
| -
|
| } // namespace trace_event
|
| } // namespace base
|
|
|