summaryrefslogtreecommitdiff
path: root/chromium/components/content_settings/core/browser/host_content_settings_map.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-08-24 12:15:48 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-08-28 13:30:04 +0000
commitb014812705fc80bff0a5c120dfcef88f349816dc (patch)
tree25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/components/content_settings/core/browser/host_content_settings_map.cc
parent9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff)
downloadqtwebengine-chromium-b014812705fc80bff0a5c120dfcef88f349816dc.tar.gz
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/content_settings/core/browser/host_content_settings_map.cc')
-rw-r--r--chromium/components/content_settings/core/browser/host_content_settings_map.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/components/content_settings/core/browser/host_content_settings_map.cc b/chromium/components/content_settings/core/browser/host_content_settings_map.cc
index 47a277e9bf0..d45b95a6d6d 100644
--- a/chromium/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/chromium/components/content_settings/core/browser/host_content_settings_map.cc
@@ -696,9 +696,9 @@ void HostContentSettingsMap::AddSettingsForOneType(
while (rule_iterator->HasNext()) {
const content_settings::Rule& rule = rule_iterator->Next();
- settings->push_back(ContentSettingPatternSource(
+ settings->emplace_back(
rule.primary_pattern, rule.secondary_pattern, rule.value->Clone(),
- kProviderNamesSourceMap[provider_type].provider_name, incognito));
+ kProviderNamesSourceMap[provider_type].provider_name, incognito);
}
}
@@ -850,7 +850,7 @@ HostContentSettingsMap::GetContentSettingValueAndPatterns(
*primary_pattern = rule.primary_pattern;
if (secondary_pattern)
*secondary_pattern = rule.secondary_pattern;
- return base::WrapUnique(rule.value.get()->DeepCopy());
+ return base::WrapUnique(rule.value->DeepCopy());
}
}
}