Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1363)

Unified Diff: base/trace_event/memory_dump_provider.cc

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/trace_event/memory_dump_provider.cc
diff --git a/base/trace_event/memory_dump_provider.cc b/base/trace_event/memory_dump_provider.cc
index 9518461dcf77906c8502d187410f53ba23755db0..a2d38897fda52b7e90233aba5a4928ba4234471c 100644
--- a/base/trace_event/memory_dump_provider.cc
+++ b/base/trace_event/memory_dump_provider.cc
@@ -4,7 +4,7 @@
#include "base/trace_event/memory_dump_provider.h"
-#include "base/logging.h"
+#include "base/single_thread_task_runner.h"
namespace base {
namespace trace_event {
@@ -12,15 +12,20 @@ namespace trace_event {
MemoryDumpProvider::MemoryDumpProvider() {
}
+MemoryDumpProvider::MemoryDumpProvider(
+ const scoped_refptr<SingleThreadTaskRunner>& task_runner)
+ : task_runner_(task_runner) {
+}
+
MemoryDumpProvider::~MemoryDumpProvider() {
}
void MemoryDumpProvider::DeclareAllocatorAttribute(
- const MemoryAllocatorDeclaredAttribute& attr) {
- DCHECK_EQ(0u, allocator_attributes_.count(attr.name))
- << "Allocator attribute " << attr.name << " already declared for dumper "
- << GetFriendlyName();
- allocator_attributes_[attr.name] = attr;
+ const std::string& allocator_name,
+ const std::string& attribute_name,
+ const std::string& attribute_type) {
+ allocator_attributes_type_info_.Set(
+ allocator_name, attribute_name, attribute_type);
}
} // namespace trace_event

Powered by Google App Engine
This is Rietveld 408576698