[tracing] directly use memory-infra from blink -> base

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 "config.h"
 #include "platform/PartitionAllocMemoryDumpProvider.h"
 
-#include "public/platform/WebMemoryAllocatorDump.h"
-#include "public/platform/WebProcessMemoryDump.h"
+#include "base/trace_event/memory_allocator_dump.h"
+#include "base/trace_event/process_memory_dump.h"
+#include "public/platform/WebString.h"
 #include "wtf/Partitions.h"
 
 namespace blink {
 
 namespace {
 
 using namespace WTF;
 
 const char kPartitionAllocDumpName[] = "partition_alloc";
 const char kPartitionsDumpName[] = "partitions";
 
 String getPartitionDumpName(const char* partitionName)
 {
     return String::format("%s/%s/%s", kPartitionAllocDumpName, kPartitionsDumpName, partitionName);
 }
 
+std::string ToStdString(const String& str) {
+  return std::string(reinterpret_cast<const char*>(str.ascii().data()));

[esprehn, 2015/09/28 18:03:14]

This cast doesn't make sense, data() is already a "const char*"

[Primiano Tucci (use gerrit), 2015/09/28 19:07:40]

Yeah, just a leftover of doing character8() which returns unsigned char* before
somebody (you?) pointed out that it is not null terminated.

+}
+
 // This class is used to invert the dependency of PartitionAlloc on the
 // PartitionAllocMemoryDumpProvider. This implements an interface that will
 // be called with memory statistics for each bucket in the allocator.
 class PartitionStatsDumperImpl final : public PartitionStatsDumper {
 public:
-    PartitionStatsDumperImpl(WebProcessMemoryDump* memoryDump, WebMemoryDumpLevelOfDetail levelOfDetail)
+    PartitionStatsDumperImpl(base::trace_event::ProcessMemoryDump* memoryDump, base::trace_event::MemoryDumpLevelOfDetail levelOfDetail)
         : m_memoryDump(memoryDump)
         , m_uid(0)
         , m_totalActiveBytes(0)
     {
     }
 
     // PartitionStatsDumper implementation.
     void partitionDumpTotals(const char* partitionName, const PartitionMemoryStats*) override;
     void partitionsDumpBucketStats(const char* partitionName, const PartitionBucketMemoryStats*) override;
 
     size_t totalActiveBytes() const { return m_totalActiveBytes; }
 
 private:
-    WebProcessMemoryDump* m_memoryDump;
+    base::trace_event::ProcessMemoryDump* m_memoryDump;
     unsigned long m_uid;
     size_t m_totalActiveBytes;
 };
 
 void PartitionStatsDumperImpl::partitionDumpTotals(const char* partitionName, const PartitionMemoryStats* memoryStats)
 {
     m_totalActiveBytes += memoryStats->totalActiveBytes;
-    String dumpName = getPartitionDumpName(partitionName);
-    WebMemoryAllocatorDump* allocatorDump = m_memoryDump->createMemoryAllocatorDump(dumpName);
+    base::trace_event::MemoryAllocatorDump* allocatorDump = m_memoryDump->CreateAllocatorDump(ToStdString(getPartitionDumpName(partitionName)));
     allocatorDump->AddScalar("size", "bytes", memoryStats->totalResidentBytes);
     allocatorDump->AddScalar("allocated_objects_size", "bytes", memoryStats->totalActiveBytes);
     allocatorDump->AddScalar("virtual_size", "bytes", memoryStats->totalMmappedBytes);
     allocatorDump->AddScalar("virtual_committed_size", "bytes", memoryStats->totalCommittedBytes);
     allocatorDump->AddScalar("decommittable_size", "bytes", memoryStats->totalDecommittableBytes);
     allocatorDump->AddScalar("discardable_size", "bytes", memoryStats->totalDiscardableBytes);
 }
 
 void PartitionStatsDumperImpl::partitionsDumpBucketStats(const char* partitionName, const PartitionBucketMemoryStats* memoryStats)
 {
     ASSERT(memoryStats->isValid);
     String dumpName = getPartitionDumpName(partitionName);
     if (memoryStats->isDirectMap)
         dumpName.append(String::format("/directMap_%lu", ++m_uid));
     else
         dumpName.append(String::format("/bucket_%u", static_cast<unsigned>(memoryStats->bucketSlotSize)));
 
-    WebMemoryAllocatorDump* allocatorDump = m_memoryDump->createMemoryAllocatorDump(dumpName);
+    base::trace_event::MemoryAllocatorDump* allocatorDump = m_memoryDump->CreateAllocatorDump(ToStdString(dumpName));
     allocatorDump->AddScalar("size", "bytes", memoryStats->residentBytes);
     allocatorDump->AddScalar("allocated_objects_size", "bytes", memoryStats->activeBytes);
     allocatorDump->AddScalar("slot_size", "bytes", memoryStats->bucketSlotSize);
     allocatorDump->AddScalar("decommittable_size", "bytes", memoryStats->decommittableBytes);
     allocatorDump->AddScalar("discardable_size", "bytes", memoryStats->discardableBytes);
     allocatorDump->AddScalar("total_pages_size", "bytes", memoryStats->allocatedPageSize);
     allocatorDump->AddScalar("active_pages", "objects", memoryStats->numActivePages);
     allocatorDump->AddScalar("full_pages", "objects", memoryStats->numFullPages);
     allocatorDump->AddScalar("empty_pages", "objects", memoryStats->numEmptyPages);
     allocatorDump->AddScalar("decommitted_pages", "objects", memoryStats->numDecommittedPages);
 }
 
 } // namespace
 
 PartitionAllocMemoryDumpProvider* PartitionAllocMemoryDumpProvider::instance()
 {
     DEFINE_STATIC_LOCAL(PartitionAllocMemoryDumpProvider, instance, ());
     return &instance;
 }
 
-bool PartitionAllocMemoryDumpProvider::onMemoryDump(WebMemoryDumpLevelOfDetail levelOfDetail, WebProcessMemoryDump* memoryDump)
+bool PartitionAllocMemoryDumpProvider::OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
+                                      base::trace_event::ProcessMemoryDump* memoryDump)
 {
-    PartitionStatsDumperImpl partitionStatsDumper(memoryDump, levelOfDetail);
+    PartitionStatsDumperImpl partitionStatsDumper(memoryDump, args.level_of_detail);
 
-    WebMemoryAllocatorDump* partitionsDump = memoryDump->createMemoryAllocatorDump(
-        String::format("%s/%s", kPartitionAllocDumpName, kPartitionsDumpName));
+    base::trace_event::MemoryAllocatorDump* partitionsDump = memoryDump->CreateAllocatorDump(
+        ToStdString(String::format("%s/%s", kPartitionAllocDumpName, kPartitionsDumpName)));
 
     // This method calls memoryStats.partitionsDumpBucketStats with memory statistics.
-    WTF::Partitions::dumpMemoryStats(levelOfDetail == WebMemoryDumpLevelOfDetail::Light, &partitionStatsDumper);
+    WTF::Partitions::dumpMemoryStats(args.level_of_detail == base::trace_event::MemoryDumpLevelOfDetail::LIGHT, &partitionStatsDumper);
 
-    WebMemoryAllocatorDump* allocatedObjectsDump = memoryDump->createMemoryAllocatorDump(
-        String::format("%s/allocated_objects", kPartitionAllocDumpName));
+    base::trace_event::MemoryAllocatorDump* allocatedObjectsDump = memoryDump->CreateAllocatorDump(
+        ToStdString(String::format("%s/allocated_objects", kPartitionAllocDumpName)));
     allocatedObjectsDump->AddScalar("size", "bytes", partitionStatsDumper.totalActiveBytes());
     memoryDump->AddOwnershipEdge(allocatedObjectsDump->guid(), partitionsDump->guid());
 
     return true;
 }
 
 PartitionAllocMemoryDumpProvider::PartitionAllocMemoryDumpProvider()
 {
 }
 
 PartitionAllocMemoryDumpProvider::~PartitionAllocMemoryDumpProvider()
 {
 }
 
 } // namespace blink