Index: chrome/browser/content_settings/host_content_settings_map.cc |
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc |
index 102c560a4892a17c5c7d8b6c57223fea8ac77a3a..b151347fd69c0041dff9d98276eef507b836f02e 100644 |
--- a/chrome/browser/content_settings/host_content_settings_map.cc |
+++ b/chrome/browser/content_settings/host_content_settings_map.cc |
@@ -114,7 +114,7 @@ HostContentSettingsMap::HostContentSettingsMap(Profile* profile) |
// |extension_service| can be NULL in unit tests. |
content_settings_providers_.push_back(make_linked_ptr( |
new content_settings::ExtensionProvider( |
- profile, |
+ this, |
extension_service->GetExtensionContentSettingsStore(), |
is_off_the_record_))); |
} |
@@ -524,6 +524,14 @@ bool HostContentSettingsMap::IsDefaultContentSettingManaged( |
return false; |
} |
+void HostContentSettingsMap::ShutdownOnUIThread() { |
+ for (ProviderIterator it = content_settings_providers_.begin(); |
+ it != content_settings_providers_.end(); |
+ ++it) { |
+ (*it)->ShutdownOnUIThread(); |
+ } |
+} |
+ |
void HostContentSettingsMap::UnregisterObservers() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
if (!profile_) |