TraceEvent fixes for thread name changes

base/debug/trace_event.h

Index: base/debug/trace_event.h
diff --git a/base/debug/trace_event.h b/base/debug/trace_event.h
index 2a6c1376ea4a404add1fd4b2886fa338de3478d4..ed98ef1f512548cca14c02625ab836d5c56cbbb8 100644
--- a/base/debug/trace_event.h
+++ b/base/debug/trace_event.h
@@ -103,7 +103,6 @@
 #include "base/callback.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted_memory.h"
-#include "base/memory/singleton.h"
 #include "base/string_util.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "base/timer.h"
@@ -325,6 +324,9 @@
           INTERNAL_TRACE_EVENT_UID(begin_event_id), threshold); \
     }
 
+template <typename Type>
+struct StaticMemorySingletonTraits;
+
 namespace base {
 
 class RefCountedString;