| Index: base/trace_event/trace_config.h
|
| diff --git a/base/trace_event/trace_config.h b/base/trace_event/trace_config.h
|
| index a5f8315bca61704d3bae44728a6c48e68b079de2..96c797e6db1897914810a81336fca4fcc693bdbc 100644
|
| --- a/base/trace_event/trace_config.h
|
| +++ b/base/trace_event/trace_config.h
|
| @@ -71,6 +71,8 @@ class BASE_EXPORT TraceConfig {
|
| // Reset the values in the config.
|
| void Clear();
|
|
|
| + void Merge(const MemoryDumpConfig& config);
|
| +
|
| // Set of memory dump modes allowed for the tracing session. The explicitly
|
| // triggered dumps will be successful only if the dump mode is allowed in
|
| // the config.
|
| @@ -243,6 +245,9 @@ class BASE_EXPORT TraceConfig {
|
| }
|
|
|
| const EventFilters& event_filters() const { return event_filters_; }
|
| + void SetEventFilterConfigs(const EventFilters& filter_configs) {
|
| + event_filters_ = filter_configs;
|
| + }
|
|
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(TraceConfigTest, TraceConfigFromValidLegacyFormat);
|
|
|