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..164c233a8f0142ac72c1e47049df90aafcd923b2 100644
--- a/base/debug/trace_event.h
+++ b/base/debug/trace_event.h
@@ -48,8 +48,8 @@
 // To avoid this issue with the |name| and |arg_name| parameters, use the
 // TRACE_EVENT_COPY_XXX overloads of the macros at additional runtime overhead.
 // Notes: The category must always be in a long-lived char* (i.e. static const).
-//        The |arg_values|, when used, are always deep copied with the _COPY

[jbates, 2011/11/08 18:44:38]

The old comment is true I think, see the use of
base::debug::TraceValue::ForceCopy in the _COPY macro arguments.

[joth, 2011/11/09 13:17:58]

Oh so they are. I think I was stood on my head when I was reading this or
something.

Reverted.

-//        macros.
+//        The |arg_values|, when used, are NOT deep copied with the _COPY
+//        macros unless the TRACE_STR_COPY marco is also use as described below.
 //
 // When are string argument values copied:
 // const char* arg_values are only referenced by default:
@@ -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;

[nduca, 2011/11/09 04:02:24]

is this needed?

[joth, 2011/11/09 13:17:58]

yep, used on line 668. This allows singleton.h to be included in the .cc
instead.

+
 namespace base {
 
 class RefCountedString;