summaryrefslogtreecommitdiffstats
path: root/chromium/base/trace_event/trace_config.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-01-29 16:35:13 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-02-01 15:33:35 +0000
commitc8c2d1901aec01e934adf561a9fdf0cc776cdef8 (patch)
tree9157c3d9815e5870799e070b113813bec53e0535 /chromium/base/trace_event/trace_config.cc
parentabefd5095b41dac94ca451d784ab6e27372e981a (diff)
BASELINE: Update Chromium to 64.0.3282.139
Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/base/trace_event/trace_config.cc')
-rw-r--r--chromium/base/trace_event/trace_config.cc19
1 files changed, 6 insertions, 13 deletions
diff --git a/chromium/base/trace_event/trace_config.cc b/chromium/base/trace_event/trace_config.cc
index 38356d8dc00..5926c9541bd 100644
--- a/chromium/base/trace_event/trace_config.cc
+++ b/chromium/base/trace_event/trace_config.cc
@@ -57,7 +57,7 @@ class ConvertableTraceConfigToTraceFormat
explicit ConvertableTraceConfigToTraceFormat(const TraceConfig& trace_config)
: trace_config_(trace_config) {}
- ~ConvertableTraceConfigToTraceFormat() override {}
+ ~ConvertableTraceConfigToTraceFormat() override = default;
void AppendAsTraceFormat(std::string* out) const override {
out->append(trace_config_.ToString());
@@ -91,12 +91,12 @@ void TraceConfig::ResetMemoryDumpConfig(
memory_dump_config_ = memory_dump_config;
}
-TraceConfig::MemoryDumpConfig::MemoryDumpConfig() {}
+TraceConfig::MemoryDumpConfig::MemoryDumpConfig() = default;
TraceConfig::MemoryDumpConfig::MemoryDumpConfig(
const MemoryDumpConfig& other) = default;
-TraceConfig::MemoryDumpConfig::~MemoryDumpConfig() {}
+TraceConfig::MemoryDumpConfig::~MemoryDumpConfig() = default;
void TraceConfig::MemoryDumpConfig::Clear() {
allowed_dump_modes.clear();
@@ -119,7 +119,7 @@ TraceConfig::EventFilterConfig::EventFilterConfig(
const std::string& predicate_name)
: predicate_name_(predicate_name) {}
-TraceConfig::EventFilterConfig::~EventFilterConfig() {}
+TraceConfig::EventFilterConfig::~EventFilterConfig() = default;
TraceConfig::EventFilterConfig::EventFilterConfig(const EventFilterConfig& tc) {
*this = tc;
@@ -224,16 +224,9 @@ TraceConfig::TraceConfig(StringPiece config_string) {
InitializeDefault();
}
-TraceConfig::TraceConfig(const TraceConfig& tc)
- : record_mode_(tc.record_mode_),
- enable_systrace_(tc.enable_systrace_),
- enable_argument_filter_(tc.enable_argument_filter_),
- category_filter_(tc.category_filter_),
- memory_dump_config_(tc.memory_dump_config_),
- event_filters_(tc.event_filters_) {}
+TraceConfig::TraceConfig(const TraceConfig& tc) = default;
-TraceConfig::~TraceConfig() {
-}
+TraceConfig::~TraceConfig() = default;
TraceConfig& TraceConfig::operator=(const TraceConfig& rhs) {
if (this == &rhs)