| 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 c8fed6e90058b1fbcdf38aad26bbcb187ebaf181..d666b835ad4a66bf50b0b9f799dbba9f850928fe 100644
|
| --- a/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
|
| +++ b/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
|
| @@ -145,7 +145,8 @@ void MigrateOldSettings(HostContentSettingsMap* map) {
|
| bool HostFilterToPatternFilter(
|
| const base::Callback<bool(const std::string&)>& host_filter,
|
| const ContentSettingsPattern& primary_pattern,
|
| - const ContentSettingsPattern& secondary_pattern) {
|
| + const ContentSettingsPattern& secondary_pattern,
|
| + base::Time last_modified) {
|
| // We only ever set origin-scoped exceptions which are of the form
|
| // "https://<host>:443". That is a valid URL, so we can compare |host_filter|
|
| // against its host.
|
| @@ -334,7 +335,8 @@ void ChromeSSLHostStateDelegate::Clear(
|
| // settings deletion is done synchronously on the UI thread, so we can use
|
| // |host_filter| by reference.
|
| base::Callback<bool(const ContentSettingsPattern& primary_pattern,
|
| - const ContentSettingsPattern& secondary_pattern)>
|
| + const ContentSettingsPattern& secondary_pattern,
|
| + base::Time last_modified)>
|
| pattern_filter;
|
| if (!host_filter.is_null()) {
|
| pattern_filter =
|
| @@ -343,7 +345,8 @@ void ChromeSSLHostStateDelegate::Clear(
|
|
|
| HostContentSettingsMapFactory::GetForProfile(profile_)
|
| ->ClearSettingsForOneTypeWithPredicate(
|
| - CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, pattern_filter);
|
| + CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, std::string(),
|
| + pattern_filter);
|
| }
|
|
|
| content::SSLHostStateDelegate::CertJudgment
|
|
|