Chromium -> Mojo roll.

base/trace_event/memory_dump_provider.h

Index: base/trace_event/memory_dump_provider.h
diff --git a/base/trace_event/memory_dump_provider.h b/base/trace_event/memory_dump_provider.h
index 1c5bbb15050fc5eeb31e92fab34afe12dc8342b8..5cc3a6ee66c1d276a2a43dc7c722968417d7d2ef 100644
--- a/base/trace_event/memory_dump_provider.h
+++ b/base/trace_event/memory_dump_provider.h
@@ -6,7 +6,7 @@
 #define BASE_TRACE_EVENT_MEMORY_DUMP_PROVIDER_H_
 
 #include "base/base_export.h"
-#include "base/macros.h"
+#include "base/trace_event/memory_allocator_attributes.h"
 
 namespace base {
 namespace trace_event {
@@ -22,11 +22,22 @@ class BASE_EXPORT MemoryDumpProvider {
 
   virtual const char* GetFriendlyName() const = 0;
 
+  const MemoryAllocatorDeclaredAttributes& allocator_attributes() const {
+    return allocator_attributes_;
+  }
+
  protected:
-  MemoryDumpProvider() {}
-  virtual ~MemoryDumpProvider() {}
+  MemoryDumpProvider();
+  virtual ~MemoryDumpProvider();
+
+  void DeclareAllocatorAttribute(const MemoryAllocatorDeclaredAttribute& attr);
 
  private:
+  // The map (attribute name -> type) that specifies the semantic of the
+  // extra attributes that the MemoryAllocatorDump(s) produced by this
+  // MemoryDumpProvider will have.
+  MemoryAllocatorDeclaredAttributes allocator_attributes_;
+
   DISALLOW_COPY_AND_ASSIGN(MemoryDumpProvider);
 };