Have all trace points emit to ETW.

base/debug/trace_event_impl.cc

Index: base/debug/trace_event_impl.cc
diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc
index f221005750918e4a70949de7f069b41715777145..3d1a83e77b8866f30e82abf46bc13afaa5bb0177 100644
--- a/base/debug/trace_event_impl.cc
+++ b/base/debug/trace_event_impl.cc
@@ -1201,6 +1201,10 @@ void TraceLog::AddTraceEventWithThreadIdAndTimestamp(
   if (flags & TRACE_EVENT_FLAG_MANGLE_ID)
     id ^= process_id_hash_;
 
+#if defined (OS_WIN)
+  TraceEventETWProvider::Trace(name, phase,  id, NULL);

[chrisha, 2013/09/04 13:32:09]

Remove extra space.

[fdoray, 2013/09/05 20:10:31]

Done.

+#endif
+
 #if defined(OS_ANDROID)
   SendToATrace(phase, GetCategoryGroupName(category_group_enabled), name, id,
                num_args, arg_names, arg_types, arg_values, convertable_values,
@@ -1321,7 +1325,10 @@ void TraceLog::AddTraceEventEtw(char phase,
                                 const void* id,
                                 const char* extra) {
 #if defined(OS_WIN)
-  TraceEventETWProvider::Trace(name, phase, id, extra);
+  TraceEventETWProvider::Trace(name,
+                               phase,
+                               reinterpret_cast<unsigned long long>(id),
+                               extra);
 #endif
   INTERNAL_TRACE_EVENT_ADD(phase, "ETW Trace Event", name,
                            TRACE_EVENT_FLAG_COPY, "id", id, "extra", extra);
@@ -1333,7 +1340,10 @@ void TraceLog::AddTraceEventEtw(char phase,
                                 const std::string& extra)
 {
 #if defined(OS_WIN)
-  TraceEventETWProvider::Trace(name, phase, id, extra);
+  TraceEventETWProvider::Trace(name,
+                               phase,
+                               reinterpret_cast<unsigned long long>(id),
+                               extra);
 #endif
   INTERNAL_TRACE_EVENT_ADD(phase, "ETW Trace Event", name,
                            TRACE_EVENT_FLAG_COPY, "id", id, "extra", extra);