Index: content/browser/tracing/tracing_controller_impl.cc |
diff --git a/content/browser/tracing/tracing_controller_impl.cc b/content/browser/tracing/tracing_controller_impl.cc |
index 3a235fe5bdaf803c7790dfdb12de1e554e952550..56350f33360e8563854d30879cf31024b0d3b825 100644 |
--- a/content/browser/tracing/tracing_controller_impl.cc |
+++ b/content/browser/tracing/tracing_controller_impl.cc |
@@ -12,6 +12,7 @@ |
#include "content/browser/tracing/trace_message_filter.h" |
#include "content/browser/tracing/tracing_ui.h" |
#include "content/common/child_process_messages.h" |
+#include "content/common/trace_event_args_whitelist.h" |
#include "content/public/browser/browser_message_filter.h" |
#include "content/public/common/content_switches.h" |
@@ -96,6 +97,11 @@ void TracingControllerImpl::SetEnabledOnFileThread( |
TraceLog::GetInstance()->SetEnabled( |
category_filter, static_cast<TraceLog::Mode>(mode), trace_options); |
+ if (trace_options.enable_args_whitelist) { |
+ TraceLog::GetInstance()->SetEventFilterPredicate( |
+ base::Bind(&content::IsTraceEventArgsWhitelisted)); |
+ } |
+ |
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback); |
} |