Remove the TRACE_EVENT_*_ETW macros.

base/trace_event/trace_log.h

Index: base/trace_event/trace_log.h
diff --git a/base/trace_event/trace_log.h b/base/trace_event/trace_log.h
index 4fb33c177a980317befbb16da17c389156f6baf1..2a228a836bbe818811a73f7563ad3446ff224a1a 100644
--- a/base/trace_event/trace_log.h
+++ b/base/trace_event/trace_log.h
@@ -10,22 +10,6 @@
 #include "base/trace_event/trace_config.h"
 #include "base/trace_event/trace_event_impl.h"
 
-// Older style trace macros with explicit id and extra data
-// Only these macros result in publishing data to ETW as currently implemented.
-// TODO(georgesak): Update/replace these with new ETW macros.
-#define TRACE_EVENT_BEGIN_ETW(name, id, extra)   \
-  base::trace_event::TraceLog::AddTraceEventEtw( \
-      TRACE_EVENT_PHASE_BEGIN, name, reinterpret_cast<const void*>(id), extra)
-
-#define TRACE_EVENT_END_ETW(name, id, extra)     \
-  base::trace_event::TraceLog::AddTraceEventEtw( \
-      TRACE_EVENT_PHASE_END, name, reinterpret_cast<const void*>(id), extra)
-
-#define TRACE_EVENT_INSTANT_ETW(name, id, extra)                          \
-  base::trace_event::TraceLog::AddTraceEventEtw(                          \
-      TRACE_EVENT_PHASE_INSTANT, name, reinterpret_cast<const void*>(id), \
-      extra)
-
 namespace base {
 
 template <typename Type>
@@ -240,14 +224,6 @@ class BASE_EXPORT TraceLog : public MemoryDumpProvider {
       const unsigned long long* arg_values,
       const scoped_refptr<ConvertableToTraceFormat>* convertable_values,
       unsigned int flags);
-  static void AddTraceEventEtw(char phase,
-                               const char* category_group,
-                               const void* id,
-                               const char* extra);
-  static void AddTraceEventEtw(char phase,
-                               const char* category_group,
-                               const void* id,
-                               const std::string& extra);
 
   void UpdateTraceEventDuration(const unsigned char* category_group_enabled,
                                 const char* name,