merge in oc-release history after reset to f5c3557f18e48e694c1aed492a8e356fea679470
diff --git a/base/test/trace_event_analyzer.h b/base/test/trace_event_analyzer.h
index e43a525..0549643 100644
--- a/base/test/trace_event_analyzer.h
+++ b/base/test/trace_event_analyzer.h
@@ -663,9 +663,7 @@
static TraceAnalyzer* Create(const std::string& json_events)
WARN_UNUSED_RESULT;
- void SetIgnoreMetadataEvents(bool ignore) {
- ignore_metadata_events_ = ignore;
- }
+ void SetIgnoreMetadataEvents(bool ignore) { ignore_metadata_events_ = true; }
// Associate BEGIN and END events with each other. This allows Query(OTHER_*)
// to access the associated event and enables Query(EVENT_DURATION).
