| Index: base/trace_event/trace_event_etw_export_win.h
|
| diff --git a/base/trace_event/trace_event_etw_export_win.h b/base/trace_event/trace_event_etw_export_win.h
|
| index 0a551c3cf0fde5eee541ef61cdb77642201d3276..eefe820481217ceb8f32f9f30a6b005f2628f07b 100644
|
| --- a/base/trace_event/trace_event_etw_export_win.h
|
| +++ b/base/trace_event/trace_event_etw_export_win.h
|
| @@ -3,8 +3,8 @@
|
| // found in the LICENSE file.
|
|
|
| // This file contains the Windows-specific exporting to ETW.
|
| -#ifndef BASE_TRACE_EVENT_TRACE_ETW_EXPORT_H_
|
| -#define BASE_TRACE_EVENT_TRACE_ETW_EXPORT_H_
|
| +#ifndef BASE_TRACE_EVENT_TRACE_EVENT_ETW_EXPORT_WIN_H_
|
| +#define BASE_TRACE_EVENT_TRACE_EVENT_ETW_EXPORT_WIN_H_
|
|
|
| #include "base/base_export.h"
|
| #include "base/trace_event/trace_event_impl.h"
|
| @@ -29,7 +29,9 @@ class BASE_EXPORT TraceEventETWExport {
|
| static void EnableETWExport();
|
| static void DisableETWExport();
|
|
|
| - static bool isETWExportEnabled() { return GetInstance()->ETWExportEnabled_; }
|
| + static bool isETWExportEnabled() {
|
| + return (GetInstance() && GetInstance()->ETWExportEnabled_);
|
| + }
|
|
|
| // Exports an event to ETW. This is mainly used in
|
| // TraceLog::AddTraceEventWithThreadIdAndTimestamp to export internal events.
|
| @@ -70,4 +72,4 @@ class BASE_EXPORT TraceEventETWExport {
|
| } // namespace trace_event
|
| } // namespace base
|
|
|
| -#endif // BASE_TRACE_EVENT_TRACE_ETW_EXPORT_H_
|
| +#endif // BASE_TRACE_EVENT_TRACE_EVENT_ETW_EXPORT_WIN_H_
|
|
|