Cleanup malloc dump provider after previous refactoring

base/trace_event/malloc_dump_provider.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/malloc_dump_provider.h"
 
 #include <stddef.h>
 
 #include <unordered_map>
 
@@ skipping 280 matching lines @@
   // The dumps of the heap profiler should be created only when heap profiling
   // was enabled (--enable-heap-profiling) AND a DETAILED dump is requested.
   // However, when enabled, the overhead of the heap profiler should be always
   // reported to avoid oscillations of the malloc total in LIGHT dumps.
 
   tid_dumping_heap_ = PlatformThread::CurrentId();
   // At this point the Insert/RemoveAllocation hooks will ignore this thread.
   // Enclosing all the temporary data structures in a scope, so that the heap
   // profiler does not see unbalanced malloc/free calls from these containers.
   {
-    size_t shim_allocated_objects_size = 0;
-    size_t shim_allocated_objects_count = 0;
     TraceEventMemoryOverhead overhead;
     std::unordered_map<AllocationContext, AllocationMetrics> metrics_by_context;
     if (args.level_of_detail == MemoryDumpLevelOfDetail::DETAILED) {
-      ShardedAllocationRegister::OutputMetrics metrics =
+      ShardedAllocationRegister::OutputMetrics shim_metrics =
           allocation_register_.UpdateAndReturnsMetrics(metrics_by_context);
 
       // Aggregate data for objects allocated through the shim.
-      shim_allocated_objects_size += metrics.size;
-      shim_allocated_objects_count += metrics.count;
+      inner_dump->AddScalar("shim_allocated_objects_size",
+                            MemoryAllocatorDump::kUnitsBytes,
+                            shim_metrics.size);
+      inner_dump->AddScalar("shim_allocator_object_count",
+                            MemoryAllocatorDump::kUnitsObjects,
+                            shim_metrics.count);
     }
     allocation_register_.EstimateTraceMemoryOverhead(&overhead);
 
-    inner_dump->AddScalar("shim_allocated_objects_size",
-                          MemoryAllocatorDump::kUnitsBytes,
-                          shim_allocated_objects_size);
-    inner_dump->AddScalar("shim_allocator_object_count",
-                          MemoryAllocatorDump::kUnitsObjects,
-                          shim_allocated_objects_count);
     pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc");
   }
   tid_dumping_heap_ = kInvalidThreadId;
 
   return true;
 }
 
 void MallocDumpProvider::OnHeapProfilingEnabled(bool enabled) {
 #if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
   if (enabled) {
@@ skipping 36 matching lines @@
   if (tid_dumping_heap_ != kInvalidThreadId &&
       tid_dumping_heap_ == PlatformThread::CurrentId())
     return;
   if (!allocation_register_.is_enabled())
     return;
   allocation_register_.Remove(address);
 }
 
 }  // namespace trace_event
 }  // namespace base