Chromium Code Reviews| 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") |
|
jww
2016/03/31 18:05:31
Should probable be:
if (setting.source != site_set
raymes
2016/04/03 23:40:19
I think there could be other settings in this list
|
| + continue; |
| // Migrate old-format settings only. |
| if (setting.secondary_pattern != ContentSettingsPattern::Wildcard()) { |
| GURL url(setting.primary_pattern.ToString()); |