| Index: base/trace_event/trace_event_etw_export_win.cc
|
| diff --git a/base/trace_event/trace_event_etw_export_win.cc b/base/trace_event/trace_event_etw_export_win.cc
|
| index f7f9eccaa4564194a0d40325d8895d80e0858e8a..1cb3b8c85fca13ccb6c8789a44acb9f056f801da 100644
|
| --- a/base/trace_event/trace_event_etw_export_win.cc
|
| +++ b/base/trace_event/trace_event_etw_export_win.cc
|
| @@ -106,12 +106,14 @@ TraceEventETWExport* TraceEventETWExport::GetInstance() {
|
|
|
| // static
|
| void TraceEventETWExport::EnableETWExport() {
|
| - GetInstance()->ETWExportEnabled_ = true;
|
| + if (GetInstance())
|
| + GetInstance()->ETWExportEnabled_ = true;
|
| }
|
|
|
| // static
|
| void TraceEventETWExport::DisableETWExport() {
|
| - GetInstance()->ETWExportEnabled_ = false;
|
| + if (GetInstance())
|
| + GetInstance()->ETWExportEnabled_ = false;
|
| }
|
|
|
| // static
|
| @@ -126,7 +128,8 @@ void TraceEventETWExport::AddEvent(
|
| const unsigned long long* arg_values,
|
| const scoped_refptr<ConvertableToTraceFormat>* convertable_values) {
|
| // We bail early in case exporting is disabled or no consumer is listening.
|
| - if (!GetInstance()->ETWExportEnabled_ || !EventEnabledChromeEvent())
|
| + if (!GetInstance() || !GetInstance()->ETWExportEnabled_ ||
|
| + !EventEnabledChromeEvent())
|
| return;
|
|
|
| std::string phase_string;
|
| @@ -224,7 +227,8 @@ void TraceEventETWExport::AddCustomEvent(const char* name,
|
| const char* arg_value_2,
|
| const char* arg_name_3,
|
| const char* arg_value_3) {
|
| - if (!GetInstance()->ETWExportEnabled_ || !EventEnabledChromeEvent())
|
| + if (!GetInstance() || !GetInstance()->ETWExportEnabled_ ||
|
| + !EventEnabledChromeEvent())
|
| return;
|
|
|
| EventWriteChromeEvent(name, phase, arg_name_1, arg_value_1, arg_name_2,
|
|
|