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

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 1115343002: Added a whitelist for trace events that are known to be PII-less. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Always set the predicate 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
Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 5f4d00f1f438d2202cc15ad6d848d519976a59a4..e40bd8cfb39b607ee3a6db8ef444c77ef8b90a95 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -16,6 +16,7 @@
#include "base/process/memory.h"
#include "base/process/process_handle.h"
#include "base/strings/string_util.h"
+#include "base/trace_event/trace_event_impl.h"
#include "build/build_config.h"
#include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/browser/defaults.h"
@@ -30,6 +31,7 @@
#include "chrome/common/logging_chrome.h"
#include "chrome/common/profiling.h"
#include "chrome/common/switch_utils.h"
+#include "chrome/common/trace_event_args_whitelist.h"
#include "chrome/common/url_constants.h"
#include "chrome/plugin/chrome_content_plugin_client.h"
#include "chrome/renderer/chrome_content_renderer_client.h"
@@ -438,6 +440,9 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) {
Profiling::ProcessStarted();
+ base::trace_event::TraceLog::GetInstance()->SetArgumentFilterPredicate(
+ base::Bind(&chrome::IsTraceEventArgsWhitelisted));
+
#if defined(OS_WIN)
v8_breakpad_support::SetUp();
#endif

Powered by Google App Engine
This is Rietveld 408576698