diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 11:40:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 12:42:11 +0000 |
| commit | 5d87695f37678f96492b258bbab36486c59866b4 (patch) | |
| tree | be9783bbaf04fb930c4d74ca9c00b5e7954c8bc6 /chromium/base/trace_event/trace_config.cc | |
| parent | 6c11fb357ec39bf087b8b632e2b1e375aef1b38b (diff) | |
BASELINE: Update Chromium to 75.0.3770.56
Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f
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 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chromium/base/trace_event/trace_config.cc b/chromium/base/trace_event/trace_config.cc index e28456bdd0c..826fff2e9bf 100644 --- a/chromium/base/trace_event/trace_config.cc +++ b/chromium/base/trace_event/trace_config.cc @@ -147,8 +147,7 @@ void TraceConfig::ProcessFilterConfig::Merge( void TraceConfig::ProcessFilterConfig::InitializeFromConfigDict( const base::DictionaryValue& dict) { included_process_ids_.clear(); - const Value* value = - dict.FindKeyOfType(kIncludedProcessesParam, Value::Type::LIST); + const Value* value = dict.FindListKey(kIncludedProcessesParam); if (!value) return; for (auto& pid_value : value->GetList()) { @@ -336,8 +335,6 @@ void TraceConfig::Merge(const TraceConfig& config) { } DCHECK_EQ(trace_buffer_size_in_events_, config.trace_buffer_size_in_events_) << "Cannot change trace buffer size"; - DCHECK_EQ(trace_buffer_size_in_kb_, config.trace_buffer_size_in_kb_) - << "Cannot change trace buffer size"; category_filter_.Merge(config.category_filter_); memory_dump_config_.Merge(config.memory_dump_config_); |