| Index: base/trace_event/heap_profiler_allocation_register.cc
|
| diff --git a/base/trace_event/heap_profiler_allocation_register.cc b/base/trace_event/heap_profiler_allocation_register.cc
|
| index bd06bd234724ffd88406e422c16bccedc75d9d61..8d2dd769c1d4fd64b4a8394c5d7825bb504c3c60 100644
|
| --- a/base/trace_event/heap_profiler_allocation_register.cc
|
| +++ b/base/trace_event/heap_profiler_allocation_register.cc
|
| @@ -7,8 +7,6 @@
|
| #include <algorithm>
|
| #include <limits>
|
|
|
| -#include "base/trace_event/trace_event_memory_overhead.h"
|
| -
|
| namespace base {
|
| namespace trace_event {
|
|
|
| @@ -152,14 +150,13 @@ AllocationRegister::ConstIterator AllocationRegister::end() const {
|
| return ConstIterator(*this, AllocationMap::kInvalidKVIndex);
|
| }
|
|
|
| -void AllocationRegister::EstimateTraceMemoryOverhead(
|
| - TraceEventMemoryOverhead* overhead) const {
|
| - size_t allocated = sizeof(AllocationRegister);
|
| - size_t resident = sizeof(AllocationRegister) +
|
| - allocations_.EstimateUsedMemory() +
|
| - backtraces_.EstimateUsedMemory();
|
| - overhead->Add(TraceEventMemoryOverhead::kHeapProfilerAllocationRegister,
|
| - allocated, resident);
|
| +size_t AllocationRegister::EstimateAllocatedMemory() const {
|
| + return sizeof(AllocationRegister);
|
| +}
|
| +
|
| +size_t AllocationRegister::EstimateResidentMemory() const {
|
| + return sizeof(AllocationRegister) + allocations_.EstimateUsedMemory() +
|
| + backtraces_.EstimateUsedMemory();
|
| }
|
|
|
| AllocationRegister::BacktraceMap::KVIndex AllocationRegister::InsertBacktrace(
|
|
|