Index: components/content_settings/core/browser/host_content_settings_map.h |
diff --git a/components/content_settings/core/browser/host_content_settings_map.h b/components/content_settings/core/browser/host_content_settings_map.h |
index d4935890889b6592f5ec035b6b560ba4bc67a63a..c9f05eb5f3e8b68377c0447f8e8ba38d4500b94d 100644 |
--- a/components/content_settings/core/browser/host_content_settings_map.h |
+++ b/components/content_settings/core/browser/host_content_settings_map.h |
@@ -19,6 +19,7 @@ |
#include "base/threading/platform_thread.h" |
#include "base/threading/thread_checker.h" |
#include "components/content_settings/core/browser/content_settings_observer.h" |
+#include "components/content_settings/core/browser/content_settings_utils.h" |
#include "components/content_settings/core/common/content_settings.h" |
#include "components/content_settings/core/common/content_settings_pattern.h" |
#include "components/content_settings/core/common/content_settings_types.h" |
@@ -237,6 +238,25 @@ class HostContentSettingsMap : public content_settings::Observer, |
// Schedules any pending lossy website settings to be written to disk. |
void FlushLossyWebsiteSettings(); |
+ // For internal use only, except in tests. |
+ static scoped_ptr<base::Value> GetContentSettingValueAndPatternsInternal( |
+ const content_settings::ProviderInterface* provider, |
+ const GURL& primary_url, |
+ const GURL& secondary_url, |
+ ContentSettingsType content_type, |
+ const std::string& resource_identifier, |
+ bool include_incognito, |
+ ContentSettingsPattern* primary_pattern, |
+ ContentSettingsPattern* secondary_pattern); |
+ |
+ // For internal use only, except in tests. |
+ static scoped_ptr<base::Value> GetContentSettingValueAndPatternsInternal( |
raymes
2015/12/03 01:56:49
It's strange to have public functions that are cal
johnme
2015/12/03 19:06:40
I can do that for GetContentSettingValueAndPattern
raymes
2015/12/03 22:19:42
Yeah it's annoying isn't it - you would have to mo
johnme
2015/12/04 17:14:32
Done #1 (called the class content_settings::TestUt
|
+ content_settings::RuleIterator* rule_iterator, |
+ const GURL& primary_url, |
+ const GURL& secondary_url, |
+ ContentSettingsPattern* primary_pattern, |
+ ContentSettingsPattern* secondary_pattern); |
+ |
// Passes ownership of |clock|. |
void SetPrefClockForTesting(scoped_ptr<base::Clock> clock); |
@@ -294,6 +314,12 @@ class HostContentSettingsMap : public content_settings::Observer, |
const std::string& resource_identifier, |
content_settings::SettingInfo* info) const; |
+ // Prevents content settings marked INHERIT_IN_INCOGNITO_EXCEPT_ALLOW from |
+ // inheriting CONTENT_SETTING_ALLOW settings from regular to incognito. |
+ static ContentSetting CoerceSettingInheritedToIncognito( |
+ ContentSettingsType content_type, |
+ ContentSetting setting); |
+ |
content_settings::PrefProvider* GetPrefProvider(); |
#ifndef NDEBUG |