[tracing] Simplify the MemoryAllocatorDump API

base/trace_event/winheap_dump_provider_win.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/trace_event/winheap_dump_provider_win.h"
 
 #include <windows.h>
 
 #include "base/trace_event/process_memory_dump.h"
 
 namespace base {
 namespace trace_event {
 
 namespace {
 
-const char kDumperFriendlyName[] = "winheap";
-
 // Report a heap dump to a process memory dump. The |heap_info| structure
 // contains the information about this heap, and |heap_name| will be used to
 // represent it in the report.
 bool ReportHeapDump(ProcessMemoryDump* pmd,
                     const WinHeapInfo& heap_info,
                     const std::string& heap_name) {
-  MemoryAllocatorDump* dump =
-      pmd->CreateAllocatorDump(kDumperFriendlyName, heap_name);
+  MemoryAllocatorDump* dump = pmd->CreateAllocatorDump("winheap");
   if (!dump)
     return false;
-  dump->set_physical_size_in_bytes(heap_info.committed_size);
-  dump->set_allocated_objects_count(heap_info.block_count);
-  dump->set_allocated_objects_size_in_bytes(heap_info.allocated_size);
+  dump->AddScalar(MemoryAllocatorDump::kNameOuterSize,
+                  MemoryAllocatorDump::kUnitsBytes, heap_info.committed_size);
+  dump->AddScalar(MemoryAllocatorDump::kNameInnerSize,
+                  MemoryAllocatorDump::kUnitsBytes, heap_info.allocated_size);
+  dump->AddScalar(MemoryAllocatorDump::kNameObjectsCount,
+                  MemoryAllocatorDump::kUnitsObjects, heap_info.block_count);
   return true;
 }
 
 }  // namespace
 
 WinHeapDumpProvider* WinHeapDumpProvider::GetInstance() {
   return Singleton<WinHeapDumpProvider,
                    LeakySingletonTraits<WinHeapDumpProvider>>::get();
 }
 
@@ skipping 49 matching lines @@
     } else if ((heap_entry.wFlags & PROCESS_HEAP_REGION) != 0) {
       heap_info->committed_size += heap_entry.Region.dwCommittedSize;
     }
   }
   CHECK(::HeapUnlock(heap_info->heap_id) == TRUE);
   return true;
 }
 
 }  // namespace trace_event
 }  // namespace base