Refactoring: Move functions from WebMemoryDumpProviderAdapter to PartitionAllocMemoryDumpProvider

content/child/web_process_memory_dump_impl.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 "content/child/web_process_memory_dump_impl.h"
 
 #include <stddef.h>
 
 #include "base/memory/discardable_memory.h"
+#include "base/trace_event/heap_profiler_heap_dump_writer.h"
 #include "base/trace_event/process_memory_dump.h"
+#include "base/trace_event/trace_event_argument.h"
+#include "base/trace_event/trace_event_memory_overhead.h"
 #include "content/child/web_memory_allocator_dump_impl.h"
 #include "skia/ext/skia_trace_memory_dump_impl.h"
 
 namespace content {
 
 WebProcessMemoryDumpImpl::WebProcessMemoryDumpImpl()
     : owned_process_memory_dump_(
           new base::trace_event::ProcessMemoryDump(nullptr)),
       process_memory_dump_(owned_process_memory_dump_.get()),
       level_of_detail_(base::trace_event::MemoryDumpLevelOfDetail::DETAILED) {}
@@ skipping 134 matching lines @@
 blink::WebMemoryAllocatorDump*
 WebProcessMemoryDumpImpl::CreateDiscardableMemoryAllocatorDump(
     const std::string& name,
     base::DiscardableMemory* discardable) {
   base::trace_event::MemoryAllocatorDump* dump =
       discardable->CreateMemoryAllocatorDump(name.c_str(),
                                              process_memory_dump_);
   return createWebMemoryAllocatorDump(dump);
 }
 
+void WebProcessMemoryDumpImpl::dumpPartitionAllocHeapUsage(
+    const base::hash_map<base::trace_event::AllocationContext, size_t>&
+        bytes_by_context,
+    base::trace_event::TraceEventMemoryOverhead& overhead) {
+  scoped_refptr<base::trace_event::MemoryDumpSessionState> session_state =
+      process_memory_dump_->session_state();
+  scoped_refptr<base::trace_event::TracedValue> heap_dump = ExportHeapDump(
+      bytes_by_context,
+      session_state->stack_frame_deduplicator(),
+      session_state->type_name_deduplicator());
+  process_memory_dump_->AddHeapDump("partition_alloc", heap_dump);

[Primiano Tucci (use gerrit), 2016/02/02 12:29:59]

why don't you pass this string as an argument and make this function generic,
i.e. dumpHeapUsage(...)

[hajimehoshi, 2016/02/03 08:20:26]

Done.

+  overhead.DumpInto("tracing/heap_profiler", process_memory_dump_);
+}
+
 }  // namespace content