Update from https://crrev.com/328418

base/trace_event/java_heap_dump_provider_android.cc

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..2a84b81b8db1ffd13852e1a5c830390e075b5989 100644
--- a/base/trace_event/java_heap_dump_provider_android.cc
+++ b/base/trace_event/java_heap_dump_provider_android.cc
@@ -10,13 +10,6 @@
 namespace base {
 namespace trace_event {
 
-namespace {
-
-const char kDumperFriendlyName[] = "JavaHeap";
-const char kDumperName[] = "java_heap";
-
-}  // namespace
-
 // static
 JavaHeapDumpProvider* JavaHeapDumpProvider::GetInstance() {
   return Singleton<JavaHeapDumpProvider,
@@ -31,23 +24,20 @@ JavaHeapDumpProvider::~JavaHeapDumpProvider() {
 
 // Called at trace dump point time. Creates a snapshot with the memory counters
 // for the current process.
-bool JavaHeapDumpProvider::DumpInto(ProcessMemoryDump* pmd) {
-  MemoryAllocatorDump* dump =
-      pmd->CreateAllocatorDump(kDumperName, MemoryAllocatorDump::kRootHeap);
+bool JavaHeapDumpProvider::OnMemoryDump(ProcessMemoryDump* pmd) {
+  MemoryAllocatorDump* dump = pmd->CreateAllocatorDump("java_heap");
 
   // These numbers come from java.lang.Runtime stats.
   long total_heap_size = 0;
   long free_heap_size = 0;
   android::JavaRuntime::GetMemoryUsage(&total_heap_size, &free_heap_size);
-  dump->set_physical_size_in_bytes(total_heap_size);
-  dump->set_allocated_objects_count(0);
-  dump->set_allocated_objects_size_in_bytes(total_heap_size - free_heap_size);
+  dump->AddScalar(MemoryAllocatorDump::kNameOuterSize,
+                  MemoryAllocatorDump::kUnitsBytes, total_heap_size);
+  dump->AddScalar(MemoryAllocatorDump::kNameInnerSize,
+                  MemoryAllocatorDump::kUnitsBytes,
+                  total_heap_size - free_heap_size);
   return true;
 }
 
-const char* JavaHeapDumpProvider::GetFriendlyName() const {
-  return kDumperFriendlyName;
-}
-
 }  // namespace trace_event
 }  // namespace base