Index: components/content_settings/core/browser/content_settings_default_provider.cc |
diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc |
index 90531a5795644596733a9027d393632c012f93c5..40c1ed491c2cf932dabb36daa06f2ec0a3e0ac1e 100644 |
--- a/components/content_settings/core/browser/content_settings_default_provider.cc |
+++ b/components/content_settings/core/browser/content_settings_default_provider.cc |
@@ -260,6 +260,10 @@ scoped_ptr<RuleIterator> DefaultProvider::GetRuleIterator( |
ContentSettingsType content_type, |
const ResourceIdentifier& resource_identifier, |
bool incognito) const { |
+ // The default provider never has incognito-specific settings. |
msramek
2015/11/27 16:30:04
This is wrong, please remove it.
With this change
johnme
2015/11/30 14:56:58
I think this is actually correct. GetRuleIterator
msramek
2015/12/01 13:41:43
Ahhh! Somehow I have never noticed this; I have al
johnme
2015/12/02 15:13:16
Acknowledged.
|
+ if (incognito) |
+ return scoped_ptr<RuleIterator>(new EmptyRuleIterator()); |
+ |
base::AutoLock lock(lock_); |
if (resource_identifier.empty()) { |
auto it(default_settings_.find(content_type)); |