Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2897)

Unified Diff: components/content_settings/core/browser/website_settings_registry_unittest.cc

Issue 1442083002: Stop inheriting push notification permissions from regular to incognito (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed mvanouwerkerk's review comments Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/content_settings/core/browser/website_settings_registry_unittest.cc
diff --git a/components/content_settings/core/browser/website_settings_registry_unittest.cc b/components/content_settings/core/browser/website_settings_registry_unittest.cc
index c476859049782aeba56e1a7e99ae9b118edc3ab2..d70a7f80aa64f6dd3c93a512f76b45a1a7353647 100644
--- a/components/content_settings/core/browser/website_settings_registry_unittest.cc
+++ b/components/content_settings/core/browser/website_settings_registry_unittest.cc
@@ -46,7 +46,8 @@ TEST_F(WebsiteSettingsRegistryTest, GetByName) {
registry()->Register(static_cast<ContentSettingsType>(10), "test", nullptr,
WebsiteSettingsInfo::UNSYNCABLE,
WebsiteSettingsInfo::LOSSY,
- WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE);
+ WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
+ WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
info = registry()->GetByName("test");
ASSERT_TRUE(info);
EXPECT_EQ(10, info->type());
@@ -71,7 +72,8 @@ TEST_F(WebsiteSettingsRegistryTest, Properties) {
make_scoped_ptr(new base::FundamentalValue(999)),
WebsiteSettingsInfo::SYNCABLE,
WebsiteSettingsInfo::LOSSY,
- WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE);
+ WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
+ WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
info = registry()->Get(static_cast<ContentSettingsType>(10));
ASSERT_TRUE(info);
EXPECT_EQ("profile.content_settings.exceptions.test", info->pref_name());
@@ -85,6 +87,8 @@ TEST_F(WebsiteSettingsRegistryTest, Properties) {
info->GetPrefRegistrationFlags());
EXPECT_EQ(WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
info->scoping_type());
+ EXPECT_EQ(WebsiteSettingsInfo::INHERIT_IN_INCOGNITO,
+ info->incognito_behavior());
}
TEST_F(WebsiteSettingsRegistryTest, Iteration) {
@@ -92,7 +96,8 @@ TEST_F(WebsiteSettingsRegistryTest, Iteration) {
make_scoped_ptr(new base::FundamentalValue(999)),
WebsiteSettingsInfo::SYNCABLE,
WebsiteSettingsInfo::LOSSY,
- WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE);
+ WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
+ WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
bool found = false;
for (const WebsiteSettingsInfo* info : *registry()) {

Powered by Google App Engine
This is Rietveld 408576698