[tracing] Track number of allocations in heap profiler

third_party/WebKit/Source/platform/web_process_memory_dump_impl.cc

Index: third_party/WebKit/Source/platform/web_process_memory_dump_impl.cc
diff --git a/third_party/WebKit/Source/platform/web_process_memory_dump_impl.cc b/third_party/WebKit/Source/platform/web_process_memory_dump_impl.cc
index 2e1745b0f5f706dd3a72f66b62add62f6355a152..56e0838e3889262e7c15545bf625348ba8c3b3db 100644
--- a/third_party/WebKit/Source/platform/web_process_memory_dump_impl.cc
+++ b/third_party/WebKit/Source/platform/web_process_memory_dump_impl.cc
@@ -167,22 +167,22 @@ WebProcessMemoryDumpImpl::createDiscardableMemoryAllocatorDump(
 }
 
 void WebProcessMemoryDumpImpl::dumpHeapUsage(
-    const base::hash_map<base::trace_event::AllocationContext, size_t>&
-        bytes_by_context,
+    const base::hash_map<base::trace_event::AllocationContext, base::trace_event::AllocationsSizeAndCount>&
+        metrics_by_context,
     base::trace_event::TraceEventMemoryOverhead& overhead,
-    const char* allocator_name) {
-  if (!bytes_by_context.empty()) {
-    scoped_refptr<base::trace_event::MemoryDumpSessionState> session_state =
-        process_memory_dump_->session_state();
-    scoped_ptr<base::trace_event::TracedValue> heap_dump = ExportHeapDump(
-        bytes_by_context, session_state->stack_frame_deduplicator(),
-        session_state->type_name_deduplicator());
-    process_memory_dump_->AddHeapDump(allocator_name, std::move(heap_dump));
-  }
-
-  std::string base_name = base::StringPrintf("tracing/heap_profiler_%s",
-                                             allocator_name);
-  overhead.DumpInto(base_name.c_str(), process_memory_dump_);
+    const char* allocator_name)
+{

[Dmitry Skiba, 2016/04/14 19:07:30]

Shouldn't this { be on the previous line?

[ssid, 2016/04/14 20:17:11]

Done.

+    if (!metrics_by_context.empty()) {

[Dmitry Skiba, 2016/04/14 19:07:30]

Something is wrong with formatting, I think this block got indented.

[Primiano Tucci (use gerrit), 2016/04/14 19:37:22]

Yup I think the TL;DR is don't run clang-format on blink :)

[ssid, 2016/04/14 20:17:11]

git cl format did this. I have manually formatted code to be consistent with the
files now.

+        scoped_refptr<base::trace_event::MemoryDumpSessionState> session_state = process_memory_dump_->session_state();
+        scoped_ptr<base::trace_event::TracedValue> heap_dump = ExportHeapDump(
+            metrics_by_context, session_state->stack_frame_deduplicator(),
+            session_state->type_name_deduplicator());
+        process_memory_dump_->AddHeapDump(allocator_name, std::move(heap_dump));
+    }
+
+    std::string base_name = base::StringPrintf("tracing/heap_profiler_%s",
+        allocator_name);
+    overhead.DumpInto(base_name.c_str(), process_memory_dump_);
 }
 
 }  // namespace content