Revert "Add option to export tracing events to ETW."

base/trace_event/trace_event_impl.cc

Index: base/trace_event/trace_event_impl.cc
diff --git a/base/trace_event/trace_event_impl.cc b/base/trace_event/trace_event_impl.cc
index 3cf4f075fe8f88b562a0c514d9e9d2e9ccf081be..834f826e04078dae5b992276b986a1581f6a1037 100644
--- a/base/trace_event/trace_event_impl.cc
+++ b/base/trace_event/trace_event_impl.cc
@@ -36,7 +36,6 @@
 #include "base/trace_event/trace_event_synthetic_delay.h"
 
 #if defined(OS_WIN)
-#include "base/trace_event/trace_event_etw_export_win.h"
 #include "base/trace_event/trace_event_win.h"
 #endif
 
@@ -1293,11 +1292,6 @@ void TraceLog::UpdateCategoryGroupEnabledFlag(size_t category_index) {
   if (event_callback_ &&
       event_callback_category_filter_.IsCategoryGroupEnabled(category_group))
     enabled_flag |= ENABLED_FOR_EVENT_CALLBACK;
-#if defined(OS_WIN)
-  if (base::trace_event::TraceEventETWExport::isETWExportEnabled())
-    enabled_flag |= ENABLED_FOR_ETW_EXPORT;
-#endif
-
   g_category_group_enabled[category_index] = enabled_flag;
 }
 
@@ -1990,15 +1984,6 @@ TraceEventHandle TraceLog::AddTraceEventWithThreadIdAndTimestamp(
     }
   }
 
-#if defined(OS_WIN)
-  // This is done sooner rather than later, to avoid creating the event and
-  // acquiring the lock, which is not needed for ETW as it's already threadsafe.
-  if (*category_group_enabled & ENABLED_FOR_ETW_EXPORT)
-    TraceEventETWExport::AddEvent(phase, category_group_enabled, name, id,
-                                  num_args, arg_names, arg_types, arg_values,
-                                  convertable_values);
-#endif  // OS_WIN
-
   std::string console_message;
   if (*category_group_enabled &
       (ENABLED_FOR_RECORDING | ENABLED_FOR_MONITORING)) {