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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/content_settings/host_content_settings_map_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: Annotate bool parameters 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
« no previous file with comments | « chrome/browser/content_settings/content_settings_default_provider_unittest.cc ('k') | components/content_settings/core/browser/content_settings_default_provider.cc » ('j') | components/content_settings/core/browser/content_settings_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_settings/host_content_settings_map_unittest.cc
diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
index 04eac30aaa1dbde21d758886ecdcd97193367931..a5bc8a92501da8c06d71bafc0c0affe7588f1051 100644
--- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc
+++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
@@ -678,11 +678,13 @@ TEST_F(HostContentSettingsMapTest, NestedSettings) {
TEST_F(HostContentSettingsMapTest, OffTheRecord) {
TestingProfile profile;
+ Profile* otr_profile = profile.GetOffTheRecordProfile();
HostContentSettingsMap* host_content_settings_map =
HostContentSettingsMapFactory::GetForProfile(&profile);
- scoped_refptr<HostContentSettingsMap> otr_map(
- new HostContentSettingsMap(profile.GetPrefs(),
- true));
+ HostContentSettingsMap* otr_map1 =
+ HostContentSettingsMapFactory::GetForProfile(otr_profile);
+ scoped_refptr<HostContentSettingsMap> otr_map2(
+ new HostContentSettingsMap(profile.GetPrefs(), true /* incognito */));
GURL host("http://example.com/");
ContentSettingsPattern pattern =
@@ -692,7 +694,10 @@ TEST_F(HostContentSettingsMapTest, OffTheRecord) {
host_content_settings_map->GetContentSetting(
host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
EXPECT_EQ(CONTENT_SETTING_ALLOW,
- otr_map->GetContentSetting(
+ otr_map1->GetContentSetting(
+ host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
+ EXPECT_EQ(CONTENT_SETTING_ALLOW,
+ otr_map2->GetContentSetting(
host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
// Changing content settings on the main map should also affect the
@@ -707,12 +712,20 @@ TEST_F(HostContentSettingsMapTest, OffTheRecord) {
host_content_settings_map->GetContentSetting(
host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
EXPECT_EQ(CONTENT_SETTING_BLOCK,
- otr_map->GetContentSetting(
+ otr_map1->GetContentSetting(
+ host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
+ EXPECT_EQ(CONTENT_SETTING_BLOCK,
+ otr_map2->GetContentSetting(
host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
- // Changing content settings on the incognito map should NOT affect the
+ // Changing content settings on the incognito maps should NOT affect the
// main map.
- otr_map->SetContentSetting(pattern,
+ otr_map1->SetContentSetting(pattern,
+ ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTINGS_TYPE_IMAGES,
+ std::string(),
+ CONTENT_SETTING_ALLOW);
+ otr_map2->SetContentSetting(pattern,
ContentSettingsPattern::Wildcard(),
CONTENT_SETTINGS_TYPE_IMAGES,
std::string(),
@@ -721,10 +734,127 @@ TEST_F(HostContentSettingsMapTest, OffTheRecord) {
host_content_settings_map->GetContentSetting(
host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
EXPECT_EQ(CONTENT_SETTING_ALLOW,
- otr_map->GetContentSetting(
+ otr_map1->GetContentSetting(
+ host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
+ EXPECT_EQ(CONTENT_SETTING_ALLOW,
+ otr_map2->GetContentSetting(
host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
- otr_map->ShutdownOnUIThread();
+ otr_map2->ShutdownOnUIThread();
+}
+
+TEST_F(HostContentSettingsMapTest, OffTheRecordPartialInheritPref) {
+ // Permissions marked INHERIT_IN_INCOGNITO_EXCEPT_ALLOW in
+ // ContentSettingsRegistry (e.g. push & notifications) only inherit blocks
+ // from the regular to incognito pref provider.
+ TestingProfile profile;
+ Profile* otr_profile = profile.GetOffTheRecordProfile();
+ HostContentSettingsMap* host_content_settings_map =
+ HostContentSettingsMapFactory::GetForProfile(&profile);
+ HostContentSettingsMap* otr_map =
+ HostContentSettingsMapFactory::GetForProfile(otr_profile);
+
+ GURL host("http://example.com/");
+ ContentSettingsPattern pattern =
+ ContentSettingsPattern::FromString("[*.]example.com");
+
+ EXPECT_EQ(CONTENT_SETTING_ASK, host_content_settings_map->GetContentSetting(
+ host, host, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string()));
+ EXPECT_EQ(CONTENT_SETTING_ASK, otr_map->GetContentSetting(
+ host, host, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string()));
+
+ // BLOCK should be inherited from the main map to the incognito map.
+ host_content_settings_map->SetContentSetting(
+ pattern,
+ ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+ std::string(),
+ CONTENT_SETTING_BLOCK);
+ EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting(
+ host, host, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string()));
+ EXPECT_EQ(CONTENT_SETTING_BLOCK, otr_map->GetContentSetting(
+ host, host, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string()));
+
+ // ALLOW should not be inherited from the main map to the incognito map (but
+ // it still overwrites the BLOCK, hence incognito reverts to ASK).
+ host_content_settings_map->SetContentSetting(
+ pattern,
+ ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+ std::string(),
+ CONTENT_SETTING_ALLOW);
+ EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting(
+ host, host, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string()));
+ EXPECT_EQ(CONTENT_SETTING_ASK, otr_map->GetContentSetting(
+ host, host, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string()));
+}
+
+TEST_F(HostContentSettingsMapTest, OffTheRecordPartialInheritDefault) {
+ // Permissions marked INHERIT_IN_INCOGNITO_EXCEPT_ALLOW in
+ // ContentSettingsRegistry (e.g. push & notifications) only inherit blocks
+ // from the regular to incognito default provider.
+ TestingProfile profile;
+ Profile* otr_profile = profile.GetOffTheRecordProfile();
+ HostContentSettingsMap* host_content_settings_map =
+ HostContentSettingsMapFactory::GetForProfile(&profile);
+ HostContentSettingsMap* otr_map =
+ HostContentSettingsMapFactory::GetForProfile(otr_profile);
+
+ GURL host("http://example.com/");
+
+ EXPECT_EQ(CONTENT_SETTING_ASK,
+ host_content_settings_map->GetDefaultContentSetting(
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS, NULL));
+ EXPECT_EQ(CONTENT_SETTING_ASK,
+ host_content_settings_map->GetContentSetting(
+ host, host, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+ std::string()));
+ EXPECT_EQ(CONTENT_SETTING_ASK,
+ otr_map->GetDefaultContentSetting(
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS, NULL));
+ EXPECT_EQ(CONTENT_SETTING_ASK,
+ otr_map->GetContentSetting(
+ host, host, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+ std::string()));
+
+ // BLOCK should be inherited from the main map to the incognito map.
+ host_content_settings_map->SetDefaultContentSetting(
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+ CONTENT_SETTING_BLOCK);
+ EXPECT_EQ(CONTENT_SETTING_BLOCK,
+ host_content_settings_map->GetDefaultContentSetting(
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS, NULL));
+ EXPECT_EQ(CONTENT_SETTING_BLOCK,
+ host_content_settings_map->GetContentSetting(
+ host, host, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+ std::string()));
+ EXPECT_EQ(CONTENT_SETTING_BLOCK,
+ otr_map->GetDefaultContentSetting(
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS, NULL));
+ EXPECT_EQ(CONTENT_SETTING_BLOCK,
+ otr_map->GetContentSetting(
+ host, host, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+ std::string()));
+
+ // ALLOW should not be inherited from the main map to the incognito map (but
+ // it still overwrites the BLOCK, hence incognito reverts to ASK).
+ host_content_settings_map->SetDefaultContentSetting(
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+ CONTENT_SETTING_ALLOW);
+ EXPECT_EQ(CONTENT_SETTING_ALLOW,
+ host_content_settings_map->GetDefaultContentSetting(
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS, NULL));
+ EXPECT_EQ(CONTENT_SETTING_ALLOW,
+ host_content_settings_map->GetContentSetting(
+ host, host, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+ std::string()));
+ EXPECT_EQ(CONTENT_SETTING_ASK,
+ otr_map->GetDefaultContentSetting(
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS, NULL));
+ EXPECT_EQ(CONTENT_SETTING_ASK,
+ otr_map->GetContentSetting(
+ host, host, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+ std::string()));
}
// For a single Unicode encoded pattern, check if it gets converted to punycode
« no previous file with comments | « chrome/browser/content_settings/content_settings_default_provider_unittest.cc ('k') | components/content_settings/core/browser/content_settings_default_provider.cc » ('j') | components/content_settings/core/browser/content_settings_utils.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698