| 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 161c778c450ff827243d70cbecc4002ca4c6fd55..65ddd4e7142870229984060d78333094972d8e06 100644
|
| --- a/components/tracing/child_trace_message_filter.cc
|
| +++ b/components/tracing/child_trace_message_filter.cc
|
| @@ -46,8 +46,8 @@ bool ChildTraceMessageFilter::OnMessageReceived(const IPC::Message& message) {
|
| ChildTraceMessageFilter::~ChildTraceMessageFilter() {}
|
|
|
| void ChildTraceMessageFilter::OnBeginTracing(
|
| - const std::vector<std::string>& included_categories,
|
| - const std::vector<std::string>& excluded_categories,
|
| + const std::vector<std::string>& included_tag_patterns,
|
| + const std::vector<std::string>& excluded_tag_patterns,
|
| base::TimeTicks browser_time) {
|
| #if defined(__native_client__)
|
| // NaCl and system times are offset by a bit, so subtract some time from
|
| @@ -57,8 +57,8 @@ void ChildTraceMessageFilter::OnBeginTracing(
|
| browser_time;
|
| TraceLog::GetInstance()->SetTimeOffset(time_offset);
|
| #endif
|
| - TraceLog::GetInstance()->SetEnabled(included_categories,
|
| - excluded_categories);
|
| + TraceLog::GetInstance()->SetEnabled(included_tag_patterns,
|
| + excluded_tag_patterns);
|
| }
|
|
|
| void ChildTraceMessageFilter::OnEndTracing() {
|
|
|