Index: chrome/common/trace_event_args_whitelist.cc |
diff --git a/chrome/common/trace_event_args_whitelist.cc b/chrome/common/trace_event_args_whitelist.cc |
index 0bffd046166189d2eea614c70215b529ebff4d1a..d107eaa7ee08fb44c66c49454bf173e7738825d9 100644 |
--- a/chrome/common/trace_event_args_whitelist.cc |
+++ b/chrome/common/trace_event_args_whitelist.cc |
@@ -8,6 +8,7 @@ |
#include "base/strings/pattern.h" |
#include "base/strings/string_tokenizer.h" |
#include "base/strings/string_util.h" |
+#include "base/trace_event/trace_event.h" |
namespace { |
@@ -18,12 +19,16 @@ struct WhitelistEntry { |
}; |
const char* const kInputLatencyAllowedArgs[] = {"data", nullptr}; |
+const char* const kMemoryDumpAllowedArgs[] = {"dumps", nullptr}; |
const WhitelistEntry kEventArgsWhitelist[] = { |
{"__metadata", "thread_name", nullptr}, |
{"ipc", "SyncChannel::Send", nullptr}, |
{"toplevel", "*", nullptr}, |
{"latencyInfo", "*", kInputLatencyAllowedArgs}, |
+ // Redefined the string since MemoryDumpManager::kTraceCategory causes |
+ // static initialization of this struct. |
Primiano Tucci (use gerrit)
2016/06/23 22:41:18
^__^ Wow. Definitely didn't expect that.
Whaatever
|
+ {TRACE_DISABLED_BY_DEFAULT("memory-infra"), "*", kMemoryDumpAllowedArgs}, |
{nullptr, nullptr, nullptr}}; |
const char* kMetadataWhitelist[] = { |