[tracing] Switch to new heap dump format.

third_party/WebKit/Source/platform/PartitionAllocMemoryDumpProvider.cpp

 // 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 "platform/PartitionAllocMemoryDumpProvider.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/heap_profiler_allocation_context.h"
 #include "base/trace_event/heap_profiler_allocation_context_tracker.h"
 #include "base/trace_event/heap_profiler_allocation_register.h"
@@ skipping 113 matching lines @@
   return &instance;
 }
 
 bool PartitionAllocMemoryDumpProvider::OnMemoryDump(
     const base::trace_event::MemoryDumpArgs& args,
     base::trace_event::ProcessMemoryDump* memoryDump) {
   using base::trace_event::MemoryDumpLevelOfDetail;
 
   MemoryDumpLevelOfDetail levelOfDetail = args.level_of_detail;
   if (m_isHeapProfilingEnabled) {
-    // Overhead should always be reported, regardless of light vs. heavy.
-    base::trace_event::TraceEventMemoryOverhead overhead;
-    base::hash_map<base::trace_event::AllocationContext,
-                   base::trace_event::AllocationMetrics>
-        metricsByContext;
-    {
-      MutexLocker locker(m_allocationRegisterMutex);
-      // Dump only the overhead estimation in non-detailed dumps.
-      if (levelOfDetail == MemoryDumpLevelOfDetail::DETAILED) {
-        for (const auto& allocSize : *m_allocationRegister) {
-          base::trace_event::AllocationMetrics& metrics =
-              metricsByContext[allocSize.context];
-          metrics.size += allocSize.size;
-          metrics.count++;
-        }
-      }
-      m_allocationRegister->EstimateTraceMemoryOverhead(&overhead);
-    }
-    memoryDump->DumpHeapUsage(metricsByContext, overhead, "partition_alloc");
+    MutexLocker locker(m_allocationRegisterMutex);
+    memoryDump->DumpHeapUsage(*m_allocationRegister, kPartitionAllocDumpName);
   }
 
   PartitionStatsDumperImpl partitionStatsDumper(memoryDump, levelOfDetail);
 
   base::trace_event::MemoryAllocatorDump* partitionsDump =
       memoryDump->CreateAllocatorDump(base::StringPrintf(
           "%s/%s", kPartitionAllocDumpName, kPartitionsDumpName));
 
   // This method calls memoryStats.partitionsDumpBucketStats with memory
   // statistics.
@@ skipping 49 matching lines @@
     m_allocationRegister->Insert(address, size, context);
 }
 
 void PartitionAllocMemoryDumpProvider::remove(void* address) {
   MutexLocker locker(m_allocationRegisterMutex);
   if (m_allocationRegister)
     m_allocationRegister->Remove(address);
 }
 
 }  // namespace blink