Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(733)

Unified Diff: content/browser/tracing/tracing_controller_impl.cc

Issue 1126553005: Set the content/ trace event PII whitelist to be the arg-filtering predicate in TraceLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@final_dropargs_predicate
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/tracing/child_trace_message_filter.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « components/tracing/child_trace_message_filter.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698