[tracing] Add trace events filtering predicate for heap profiler

base/trace_event/trace_event_unittest.cc

Index: base/trace_event/trace_event_unittest.cc
diff --git a/base/trace_event/trace_event_unittest.cc b/base/trace_event/trace_event_unittest.cc
index bfcbd2fe2528de97dce90e5f08657c8fa254f733..ace98fdf6e837c679a93cb87e3eb099f4dea6c6c 100644
--- a/base/trace_event/trace_event_unittest.cc
+++ b/base/trace_event/trace_event_unittest.cc
@@ -3280,14 +3280,14 @@ TEST_F(TraceEventTestFixture, EventFiltering) {
 }
 
 TEST_F(TraceEventTestFixture, EventWhitelistFiltering) {
-  const char config_json[] =
+  std::string config_json = StringPrintf(
       "{"
       "  \"included_categories\": ["
       "    \"filtered_cat\","
       "    \"unfiltered_cat\"],"
       "  \"event_filters\": ["
       "     {"
-      "       \"filter_predicate\": \"event_whitelist_predicate\", "
+      "       \"filter_predicate\": \"%s\", "
       "       \"included_categories\": [\"*\"], "
       "       \"excluded_categories\": [\"unfiltered_cat\"], "
       "       \"filter_args\": {"
@@ -3296,7 +3296,8 @@ TEST_F(TraceEventTestFixture, EventWhitelistFiltering) {
       "     }"
       "    "
       "  ]"
-      "}";
+      "}",
+      TraceLog::TraceEventFilter::kEventWhitelistPredicate);
 
   TraceConfig trace_config(config_json);
   TraceLog::GetInstance()->SetEnabled(trace_config, TraceLog::RECORDING_MODE);
@@ -3313,6 +3314,38 @@ TEST_F(TraceEventTestFixture, EventWhitelistFiltering) {
   EXPECT_TRUE(FindMatchingValue("name", "a cat"));
 }
 
+TEST_F(TraceEventTestFixture, HeapProfilerFiltering) {
+  std::string config_json = StringPrintf(
+      "{"
+      "  \"included_categories\": ["
+      "    \"filtered_cat\","
+      "    \"unfiltered_cat\"],"
+      "  \"excluded_categories\": [\"excluded_cat\"],"
+      "  \"event_filters\": ["
+      "     {"
+      "       \"filter_predicate\": \"%s\", "
+      "       \"included_categories\": [\"*\"]"
+      "     }"
+      "  ]"
+      "}",
+      TraceLog::TraceEventFilter::kHeapProfilerPredicate);
+
+  TraceConfig trace_config(config_json);
+  TraceLog::GetInstance()->SetEnabled(trace_config, TraceLog::RECORDING_MODE);
+  EXPECT_TRUE(TraceLog::GetInstance()->IsEnabled());
+
+  TRACE_EVENT0("filtered_cat", "a snake");
+  TRACE_EVENT0("excluded_cat", "a mushroom");
+  TRACE_EVENT0("unfiltered_cat", "a cat");
+
+  EndTraceAndFlush();
+
+  // The predicate should not change behavior of the trace events.
+  EXPECT_TRUE(FindMatchingValue("name", "a snake"));
+  EXPECT_FALSE(FindMatchingValue("name", "a mushroom"));
+  EXPECT_TRUE(FindMatchingValue("name", "a cat"));
+}
+
 TEST_F(TraceEventTestFixture, ClockSyncEventsAreAlwaysAddedToTrace) {
   BeginSpecificTrace("-*");
   TRACE_EVENT_CLOCK_SYNC_RECEIVER(1);