| 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 3d58d873ad52552cf7473e04c3bf505b7bb9cee2..d97365a3d894e4f86bf7c068a17adaeebc53d4b9 100644
|
| --- a/base/trace_event/trace_event_impl.cc
|
| +++ b/base/trace_event/trace_event_impl.cc
|
| @@ -36,11 +36,6 @@
|
| #include "base/trace_event/trace_event.h"
|
| #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
|
| -
|
| class DeleteTraceLogForTesting {
|
| public:
|
| static void Delete() {
|
| @@ -1238,11 +1233,6 @@ void TraceLog::UpdateCategoryGroupEnabledFlag(size_t category_index) {
|
| if (event_callback_ &&
|
| event_callback_trace_config_.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;
|
| }
|
|
|
| @@ -1941,15 +1931,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)) {
|
| @@ -2071,9 +2052,6 @@ void TraceLog::AddTraceEventEtw(char phase,
|
| const char* name,
|
| const void* id,
|
| const char* extra) {
|
| -#if defined(OS_WIN)
|
| - TraceEventETWProvider::Trace(name, phase, id, extra);
|
| -#endif
|
| INTERNAL_TRACE_EVENT_ADD(phase, "ETW Trace Event", name,
|
| TRACE_EVENT_FLAG_COPY, "id", id, "extra", extra);
|
| }
|
| @@ -2082,10 +2060,7 @@ void TraceLog::AddTraceEventEtw(char phase,
|
| const char* name,
|
| const void* id,
|
| const std::string& extra) {
|
| -#if defined(OS_WIN)
|
| - TraceEventETWProvider::Trace(name, phase, id, extra);
|
| -#endif
|
| - INTERNAL_TRACE_EVENT_ADD(phase, "ETW Trace Event", name,
|
| + INTERNAL_TRACE_EVENT_ADD(phase, "ETW Trace Event", name,
|
| TRACE_EVENT_FLAG_COPY, "id", id, "extra", extra);
|
| }
|
|
|
|
|