| Index: components/tracing/child_trace_message_filter.cc
|
| diff --git a/components/tracing/child_trace_message_filter.cc b/components/tracing/child_trace_message_filter.cc
|
| index e3daa1a85dac01eef2262284fd6984ccc6139f70..fe13ff57dd08ca8d7038c7c38ad091bafa18e145 100644
|
| --- a/components/tracing/child_trace_message_filter.cc
|
| +++ b/components/tracing/child_trace_message_filter.cc
|
| @@ -59,11 +59,12 @@ void ChildTraceMessageFilter::OnBeginTracing(
|
| browser_time;
|
| TraceLog::GetInstance()->SetTimeOffset(time_offset);
|
| #endif
|
| -
|
| + base::debug::TraceOptions trace_options;
|
| + trace_options.SetFromString(options);
|
| TraceLog::GetInstance()->SetEnabled(
|
| base::debug::CategoryFilter(category_filter_str),
|
| base::debug::TraceLog::RECORDING_MODE,
|
| - base::debug::TraceOptions(options));
|
| + trace_options);
|
| }
|
|
|
| void ChildTraceMessageFilter::OnEndTracing() {
|
| @@ -81,10 +82,12 @@ void ChildTraceMessageFilter::OnEnableMonitoring(
|
| const std::string& category_filter_str,
|
| base::TimeTicks browser_time,
|
| const std::string& options) {
|
| + base::debug::TraceOptions trace_options;
|
| + trace_options.SetFromString(options);
|
| TraceLog::GetInstance()->SetEnabled(
|
| base::debug::CategoryFilter(category_filter_str),
|
| base::debug::TraceLog::MONITORING_MODE,
|
| - base::debug::TraceOptions(options));
|
| + trace_options);
|
| }
|
|
|
| void ChildTraceMessageFilter::OnDisableMonitoring() {
|
|
|