diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/base/trace_event/trace_config.cc | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
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.cc | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/chromium/base/trace_event/trace_config.cc b/chromium/base/trace_event/trace_config.cc index 7ee9a4a101b..b2ffec153bb 100644 --- a/chromium/base/trace_event/trace_config.cc +++ b/chromium/base/trace_event/trace_config.cc @@ -51,14 +51,6 @@ const char kEventFiltersParam[] = "event_filters"; const char kFilterPredicateParam[] = "filter_predicate"; const char kFilterArgsParam[] = "filter_args"; -// Default configuration of memory dumps. -const TraceConfig::MemoryDumpConfig::Trigger kDefaultHeavyMemoryDumpTrigger = { - 2000, // min_time_between_dumps_ms - MemoryDumpLevelOfDetail::DETAILED, MemoryDumpType::PERIODIC_INTERVAL}; -const TraceConfig::MemoryDumpConfig::Trigger kDefaultLightMemoryDumpTrigger = { - 250, // min_time_between_dumps_ms - MemoryDumpLevelOfDetail::LIGHT, MemoryDumpType::PERIODIC_INTERVAL}; - class ConvertableTraceConfigToTraceFormat : public base::trace_event::ConvertableToTraceFormat { public: @@ -256,10 +248,6 @@ TraceConfig& TraceConfig::operator=(const TraceConfig& rhs) { return *this; } -const TraceConfig::StringList& TraceConfig::GetSyntheticDelayValues() const { - return category_filter_.synthetic_delays(); -} - std::string TraceConfig::ToString() const { std::unique_ptr<DictionaryValue> dict = ToDict(); std::string json; @@ -462,8 +450,6 @@ void TraceConfig::SetMemoryDumpConfigFromConfigDict( void TraceConfig::SetDefaultMemoryDumpConfig() { memory_dump_config_.Clear(); - memory_dump_config_.triggers.push_back(kDefaultHeavyMemoryDumpTrigger); - memory_dump_config_.triggers.push_back(kDefaultLightMemoryDumpTrigger); memory_dump_config_.allowed_dump_modes = GetDefaultAllowedMemoryDumpModes(); } |