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 b47f7162fca2d45b925d47306315bc4b81f59c0d..ce52645644575b2d8e788f4c4b88f9008249b485 100644
--- a/base/debug/trace_event.h
+++ b/base/debug/trace_event.h
@@ -103,8 +103,8 @@
 #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/synchronization/lock.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "base/timer.h"
 
@@ -325,6 +325,9 @@
           INTERNAL_TRACE_EVENT_UID(begin_event_id), threshold); \
     }
 
+template <typename Type>
+struct StaticMemorySingletonTraits;
+
 namespace base {
 
 class RefCountedString;