| 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 966355736491a3747a6f557a2a86062d38665eb5..197d22f51f6481291da012b7eb95a6d33f2ab131 100644
|
| --- a/components/tracing/child_trace_message_filter.cc
|
| +++ b/components/tracing/child_trace_message_filter.cc
|
| @@ -9,7 +9,7 @@
|
| #include "components/tracing/tracing_messages.h"
|
| #include "ipc/ipc_channel.h"
|
|
|
| -using base::debug::TraceLog;
|
| +using base::trace_event::TraceLog;
|
|
|
| namespace tracing {
|
|
|
| @@ -58,11 +58,11 @@ void ChildTraceMessageFilter::OnBeginTracing(
|
| browser_time;
|
| TraceLog::GetInstance()->SetTimeOffset(time_offset);
|
| #endif
|
| - base::debug::TraceOptions trace_options;
|
| + base::trace_event::TraceOptions trace_options;
|
| trace_options.SetFromString(options);
|
| TraceLog::GetInstance()->SetEnabled(
|
| - base::debug::CategoryFilter(category_filter_str),
|
| - base::debug::TraceLog::RECORDING_MODE,
|
| + base::trace_event::CategoryFilter(category_filter_str),
|
| + base::trace_event::TraceLog::RECORDING_MODE,
|
| trace_options);
|
| }
|
|
|
| @@ -81,11 +81,11 @@ void ChildTraceMessageFilter::OnEnableMonitoring(
|
| const std::string& category_filter_str,
|
| base::TimeTicks browser_time,
|
| const std::string& options) {
|
| - base::debug::TraceOptions trace_options;
|
| + base::trace_event::TraceOptions trace_options;
|
| trace_options.SetFromString(options);
|
| TraceLog::GetInstance()->SetEnabled(
|
| - base::debug::CategoryFilter(category_filter_str),
|
| - base::debug::TraceLog::MONITORING_MODE,
|
| + base::trace_event::CategoryFilter(category_filter_str),
|
| + base::trace_event::TraceLog::MONITORING_MODE,
|
| trace_options);
|
| }
|
|
|
|
|