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

Unified Diff: base/trace_event/trace_event_filter_test_utils.cc

Issue 2557743002: tracing: simplify lifetime of TraceEventFilter(s) (Closed)
Patch Set: rebase Created 4 years 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: base/trace_event/trace_event_filter_test_utils.cc
diff --git a/base/trace_event/trace_event_filter_test_utils.cc b/base/trace_event/trace_event_filter_test_utils.cc
index 06548b049a2f1e69d212dbef2315e8d3fd8b5bea..6687d0e0ae74329663e2b7598747ec5464124d59 100644
--- a/base/trace_event/trace_event_filter_test_utils.cc
+++ b/base/trace_event/trace_event_filter_test_utils.cc
@@ -19,15 +19,22 @@ bool TestEventFilter::filter_return_value_;
// static
std::unique_ptr<TraceEventFilter> TestEventFilter::Factory(
- const std::string& predicate_name) {
+ const std::string& predicate_name,
+ std::unique_ptr<TraceEventFilter::Config> base_filter_config) {
std::unique_ptr<TraceEventFilter> res;
if (predicate_name == kName)
- res.reset(new TestEventFilter());
+ res.reset(new TestEventFilter(std::move(base_filter_config)));
return res;
}
-TestEventFilter::TestEventFilter() {}
-TestEventFilter::~TestEventFilter() {}
+TestEventFilter::TestEventFilter(
+ std::unique_ptr<TraceEventFilter::Config> base_filter_config)
+ : TraceEventFilter(std::move(base_filter_config)) {}
+
+TestEventFilter::~TestEventFilter() {
+ if (g_hits_counter)
+ g_hits_counter->dtor_hit_count++;
+}
bool TestEventFilter::FilterTraceEvent(const TraceEvent& trace_event) const {
if (g_hits_counter)
@@ -55,6 +62,7 @@ TestEventFilter::HitsCounter::~HitsCounter() {
void TestEventFilter::HitsCounter::Reset() {
filter_trace_event_hit_count = 0;
end_event_hit_count = 0;
+ dtor_hit_count = 0;
}
} // namespace trace_event

Powered by Google App Engine
This is Rietveld 408576698