| Index: content/browser/tracing/trace_message_filter.cc
|
| diff --git a/content/browser/tracing/trace_message_filter.cc b/content/browser/tracing/trace_message_filter.cc
|
| index f981e9d76d2cd778b73b305fbdca68598806a15e..54398acc0763daa243385d9b7c364c8e21d01081 100644
|
| --- a/content/browser/tracing/trace_message_filter.cc
|
| +++ b/content/browser/tracing/trace_message_filter.cc
|
| @@ -5,6 +5,7 @@
|
| #include "content/browser/tracing/trace_message_filter.h"
|
|
|
| #include "components/tracing/tracing_messages.h"
|
| +#include "content/browser/tracing/background_tracing_manager_impl.h"
|
| #include "content/browser/tracing/tracing_controller_impl.h"
|
|
|
| namespace content {
|
| @@ -34,6 +35,7 @@ void TraceMessageFilter::OnChannelClosing() {
|
| OnTraceLogStatusReply(base::trace_event::TraceLogStatus());
|
|
|
| TracingControllerImpl::GetInstance()->RemoveTraceMessageFilter(this);
|
| + BackgroundTracingManagerImpl::GetInstance()->RemoveFilter(this);
|
| }
|
| }
|
|
|
| @@ -58,6 +60,8 @@ bool TraceMessageFilter::OnMessageReceived(const IPC::Message& message) {
|
| OnGlobalMemoryDumpRequest)
|
| IPC_MESSAGE_HANDLER(TracingHostMsg_ProcessMemoryDumpResponse,
|
| OnProcessMemoryDumpResponse)
|
| + IPC_MESSAGE_HANDLER(TracingHostMsg_TriggerBackgroundTrace,
|
| + OnTriggerBackgroundTrace)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| return handled;
|
| @@ -134,6 +138,7 @@ void TraceMessageFilter::SendGlobalMemoryDumpResponse(uint64 dump_guid,
|
| void TraceMessageFilter::OnChildSupportsTracing() {
|
| has_child_ = true;
|
| TracingControllerImpl::GetInstance()->AddTraceMessageFilter(this);
|
| + BackgroundTracingManagerImpl::GetInstance()->AddFilter(this);
|
| }
|
|
|
| void TraceMessageFilter::OnEndTracingAck(
|
| @@ -202,4 +207,8 @@ void TraceMessageFilter::OnProcessMemoryDumpResponse(uint64 dump_guid,
|
| this, dump_guid, success);
|
| }
|
|
|
| +void TraceMessageFilter::OnTriggerBackgroundTrace(const std::string& name) {
|
| + BackgroundTracingManagerImpl::GetInstance()->OnHistogramTrigger(name);
|
| +}
|
| +
|
| } // namespace content
|
|
|