[tracing] Simplify MemoryDumpProvider interface

base/trace_event/memory_allocator_dump_unittest.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/memory_allocator_dump.h"
 
 #include "base/trace_event/memory_dump_provider.h"
 #include "base/trace_event/memory_dump_session_state.h"
 #include "base/trace_event/process_memory_dump.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 namespace trace_event {
 
 namespace {
 
 class FakeMemoryAllocatorDumpProvider : public MemoryDumpProvider {
  public:
-  FakeMemoryAllocatorDumpProvider() {
-    DeclareAllocatorAttribute("foobar_allocator", "attr1", "count");
-    DeclareAllocatorAttribute("foobar_allocator", "attr2", "bytes");
-  }
-
-  bool DumpInto(ProcessMemoryDump* pmd) override {
+  bool OnMemoryDump(ProcessMemoryDump* pmd) override {
     MemoryAllocatorDump* root_heap = pmd->CreateAllocatorDump(
         "foobar_allocator", MemoryAllocatorDump::kRootHeap);
     root_heap->set_physical_size_in_bytes(4096);
     root_heap->set_allocated_objects_count(42);
     root_heap->set_allocated_objects_size_in_bytes(1000);
-    root_heap->SetAttribute("attr1", 1234);
-    root_heap->SetAttribute("attr2", 99);
 
     MemoryAllocatorDump* sub_heap =
         pmd->CreateAllocatorDump("foobar_allocator", "sub_heap");
     sub_heap->set_physical_size_in_bytes(1);
     sub_heap->set_allocated_objects_count(2);
     sub_heap->set_allocated_objects_size_in_bytes(3);
 
     pmd->CreateAllocatorDump("foobar_allocator", "sub_heap/empty");
     // Leave the rest of sub heap deliberately uninitialized, to check that
     // CreateAllocatorDump returns a properly zero-initialized object.
 
     return true;
   }
-
-  const char* GetFriendlyName() const override { return "FooBar Allocator"; }
 };
 }  // namespace
 
 TEST(MemoryAllocatorDumpTest, DumpIntoProcessMemoryDump) {
   FakeMemoryAllocatorDumpProvider fmadp;
   ProcessMemoryDump pmd(make_scoped_refptr(new MemoryDumpSessionState()));
-  pmd.session_state()->allocators_attributes_type_info.Update(
-      fmadp.allocator_attributes_type_info());
 
-  fmadp.DumpInto(&pmd);
+  fmadp.OnMemoryDump(&pmd);
 
   ASSERT_EQ(3u, pmd.allocator_dumps().size());
 
   const MemoryAllocatorDump* root_heap =
       pmd.GetAllocatorDump("foobar_allocator", MemoryAllocatorDump::kRootHeap);
   ASSERT_NE(nullptr, root_heap);
   EXPECT_EQ("foobar_allocator", root_heap->allocator_name());
   EXPECT_EQ("", root_heap->heap_name());
   EXPECT_NE("", root_heap->GetAbsoluteName());
   EXPECT_EQ(4096u, root_heap->physical_size_in_bytes());
   EXPECT_EQ(42u, root_heap->allocated_objects_count());
   EXPECT_EQ(1000u, root_heap->allocated_objects_size_in_bytes());
 
-  // Check the extra attributes of |root_heap|.
-  EXPECT_EQ(1234, root_heap->GetIntegerAttribute("attr1"));
-  EXPECT_EQ(99, root_heap->GetIntegerAttribute("attr2"));
-
   const MemoryAllocatorDump* sub_heap =
       pmd.GetAllocatorDump("foobar_allocator", "sub_heap");
   ASSERT_NE(nullptr, sub_heap);
   EXPECT_EQ("foobar_allocator", sub_heap->allocator_name());
   EXPECT_EQ("sub_heap", sub_heap->heap_name());
   EXPECT_NE("", sub_heap->GetAbsoluteName());
   EXPECT_EQ(1u, sub_heap->physical_size_in_bytes());
   EXPECT_EQ(2u, sub_heap->allocated_objects_count());
   EXPECT_EQ(3u, sub_heap->allocated_objects_size_in_bytes());
 
@@ skipping 22 matching lines @@
   ASSERT_DEATH(
       pmd.CreateAllocatorDump("foo_allocator", MemoryAllocatorDump::kRootHeap),
       "");
   ASSERT_DEATH(pmd.CreateAllocatorDump("bar_allocator", "heap"), "");
   ASSERT_DEATH(pmd.CreateAllocatorDump("", "must_have_allocator_name"), "");
 }
 #endif
 
 }  // namespace trace_event
 }  // namespace base