Tracing pre-filtering

base/trace_event/trace_config_unittest.cc

Index: base/trace_event/trace_config_unittest.cc
diff --git a/base/trace_event/trace_config_unittest.cc b/base/trace_event/trace_config_unittest.cc
index a17337619b2fe4039cf08d5e8feb2e1c8503093f..87a32bcb4f8427d9f966eb6addf2ecac5030bb74 100644
--- a/base/trace_event/trace_config_unittest.cc
+++ b/base/trace_event/trace_config_unittest.cc
@@ -5,6 +5,7 @@
 #include <stddef.h>
 
 #include "base/json/json_reader.h"
+#include "base/json/json_writer.h"
 #include "base/macros.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "base/trace_event/trace_config.h"
@@ -30,6 +31,14 @@ const char kCustomTraceConfigString[] =
     "\"enable_argument_filter\":true,"
     "\"enable_sampling\":true,"
     "\"enable_systrace\":true,"
+    "\"event_filters\":["
+      "{"
+        "\"excluded_categories\":[\"unfiltered_cat\"],"
+        "\"filter_args\":{\"event_name_whitelist\":[\"a snake\",\"a dog\"]},"
+        "\"filter_predicate\":\"event_whitelist_predicate\","
+        "\"included_categories\":[\"*\"]"
+      "}"
+    "],"
     "\"excluded_categories\":[\"excluded\",\"exc_pattern*\"],"
     "\"included_categories\":[\"included\","
                             "\"inc_pattern*\","
@@ -282,6 +291,8 @@ TEST(TraceConfigTest, ConstructDefaultTraceConfig) {
   EXPECT_TRUE(tc.IsCategoryGroupEnabled("CategoryDebug,Category1"));
   EXPECT_TRUE(tc.IsCategoryGroupEnabled("CategoryTest,not-excluded-category"));
   EXPECT_FALSE(tc.IsCategoryGroupEnabled("CategoryDebug,CategoryTest"));
+
+  EXPECT_TRUE(tc.event_filters().empty());
 }
 
 TEST(TraceConfigTest, TraceConfigFromDict) {
@@ -335,6 +346,14 @@ TEST(TraceConfigTest, TraceConfigFromValidString) {
       "\"enable_argument_filter\":true,"
       "\"enable_sampling\":true,"
       "\"enable_systrace\":true,"
+      "\"event_filters\":["
+        "{"
+          "\"excluded_categories\":[\"unfiltered_cat\"],"
+          "\"filter_args\":{\"event_name_whitelist\":[\"a snake\",\"a dog\"]},"
+          "\"filter_predicate\":\"event_whitelist_predicate\","
+          "\"included_categories\":[\"*\"]"
+        "}"
+      "],"
       "\"excluded_categories\":[\"excluded\",\"exc_pattern*\"],"
       "\"included_categories\":[\"included\","
                                "\"inc_pattern*\","
@@ -378,6 +397,21 @@ TEST(TraceConfigTest, TraceConfigFromValidString) {
   EXPECT_STREQ("test.Delay1;16", tc.GetSyntheticDelayValues()[0].c_str());
   EXPECT_STREQ("test.Delay2;32", tc.GetSyntheticDelayValues()[1].c_str());
 
+  EXPECT_EQ(tc.event_filters().size(), 1u);
+  const TraceConfig::EventFilterConfig& event_filter = tc.event_filters()[0];
+  EXPECT_STREQ(event_filter.predicate_name().c_str(),
+               "event_whitelist_predicate");
+  EXPECT_EQ(event_filter.included_categories().size(), 1u);
+  EXPECT_STREQ(event_filter.included_categories()[0].c_str(), "*");
+  EXPECT_EQ(event_filter.excluded_categories().size(), 1u);
+  EXPECT_STREQ(event_filter.excluded_categories()[0].c_str(), "unfiltered_cat");
+  EXPECT_TRUE(event_filter.filter_args());
+
+  std::string json_out;
+  base::JSONWriter::Write(*event_filter.filter_args(), &json_out);
+  EXPECT_STREQ(json_out.c_str(),
+               "{\"event_name_whitelist\":[\"a snake\",\"a dog\"]}");
+
   const char config_string_2[] = "{\"included_categories\":[\"*\"]}";
   TraceConfig tc2(config_string_2);
   EXPECT_TRUE(tc2.IsCategoryEnabled("non-disabled-by-default-pattern"));