Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5776)

Unified Diff: chrome/browser/ssl/chrome_ssl_host_state_delegate.cc

Issue 1754073002: Migrate old settings for ContentSettingTypes with wildcard as secondary_pattern (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scoping_set_content_setting
Patch Set: use string 'preference' Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
diff --git a/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc b/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
index e3cd5dd7a60ecb56ab87dbacc12754e1df801c13..30a0ce36723ad7e239721e2613f4cc55c217914c 100644
--- a/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
+++ b/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
@@ -109,6 +109,9 @@ void MigrateOldSettings(HostContentSettingsMap* map) {
map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,
std::string(), &settings);
for (const ContentSettingPatternSource& setting : settings) {
+ // Migrate user preference settings only.
+ if (setting.source != "preference")
+ continue;
// Migrate old-format settings only.
if (setting.secondary_pattern != ContentSettingsPattern::Wildcard()) {
GURL url(setting.primary_pattern.ToString());

Powered by Google App Engine
This is Rietveld 408576698