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

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

Issue 1895993003: Add migration code to change existing domain scoped content settings to be origin scoped (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove logs and format Created 4 years, 6 months 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 223d810774f0e6c74bb98a1c987312750439a8c7..5e3630c0a84f4fdb7104f1a6dedfd1e6ffe9d708 100644
--- a/components/content_settings/core/browser/website_settings_registry_unittest.cc
+++ b/components/content_settings/core/browser/website_settings_registry_unittest.cc
@@ -50,7 +50,7 @@ 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_ORIGIN_ONLY_SCOPE,
WebsiteSettingsRegistry::ALL_PLATFORMS,
WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
info = registry()->GetByName("test");
@@ -91,7 +91,7 @@ TEST_F(WebsiteSettingsRegistryTest, Properties) {
base::WrapUnique(new base::FundamentalValue(999)),
WebsiteSettingsInfo::SYNCABLE,
WebsiteSettingsInfo::LOSSY,
- WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
+ WebsiteSettingsInfo::TOP_LEVEL_ORIGIN_ONLY_SCOPE,
WebsiteSettingsRegistry::ALL_PLATFORMS,
WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
info = registry()->Get(static_cast<ContentSettingsType>(10));
@@ -109,7 +109,7 @@ TEST_F(WebsiteSettingsRegistryTest, Properties) {
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF,
info->GetPrefRegistrationFlags());
#endif
- EXPECT_EQ(WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
+ EXPECT_EQ(WebsiteSettingsInfo::TOP_LEVEL_ORIGIN_ONLY_SCOPE,
info->scoping_type());
EXPECT_EQ(WebsiteSettingsInfo::INHERIT_IN_INCOGNITO,
info->incognito_behavior());
@@ -120,7 +120,7 @@ TEST_F(WebsiteSettingsRegistryTest, Iteration) {
base::WrapUnique(new base::FundamentalValue(999)),
WebsiteSettingsInfo::SYNCABLE,
WebsiteSettingsInfo::LOSSY,
- WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
+ WebsiteSettingsInfo::TOP_LEVEL_ORIGIN_ONLY_SCOPE,
WebsiteSettingsRegistry::ALL_PLATFORMS,
WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);

Powered by Google App Engine
This is Rietveld 408576698