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

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

Issue 1991623005: Only Register() platform specific content settings types on different platforms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: split the changes and register images, plugins, mouselock in this CL 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/content_settings_registry_unittest.cc
diff --git a/components/content_settings/core/browser/content_settings_registry_unittest.cc b/components/content_settings/core/browser/content_settings_registry_unittest.cc
index 4184b8c99a29ef3a4b54661777100a8f865170a0..1a9af1c6be26db3dfbfbcb9e7f88bca6f86630e2 100644
--- a/components/content_settings/core/browser/content_settings_registry_unittest.cc
+++ b/components/content_settings/core/browser/content_settings_registry_unittest.cc
@@ -32,6 +32,25 @@ class ContentSettingsRegistryTest : public testing::Test {
ContentSettingsRegistry registry_;
};
+TEST_F(ContentSettingsRegistryTest, GetPlatformDependent) {
+#if defined(OS_IOS)
+ // Javascript shouldn't be registered on iOS.
+ EXPECT_FALSE(registry()->Get(CONTENT_SETTINGS_TYPE_JAVASCRIPT));
+#endif
+
+// Protected media identifier only get registered on android and chromeos.
+#if defined(ANDROID) | defined(OS_CHROMEOS)
+ EXPECT_TRUE(
+ registry()->Get(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER));
+#else
+ EXPECT_FALSE(
+ registry()->Get(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER));
+#endif
+
+ // Cookies is registered on all platforms.
+ EXPECT_TRUE(registry()->Get(CONTENT_SETTINGS_TYPE_COOKIES));
+}
+
TEST_F(ContentSettingsRegistryTest, Properties) {
// The cookies type should be registered.
const ContentSettingsInfo* info =
@@ -62,8 +81,13 @@ TEST_F(ContentSettingsRegistryTest, Properties) {
ASSERT_TRUE(
website_settings_info->initial_default_value()->GetAsInteger(&setting));
EXPECT_EQ(CONTENT_SETTING_ALLOW, setting);
+#if defined(OS_IOS)
+ EXPECT_EQ(PrefRegistry::NO_REGISTRATION_FLAGS,
+ website_settings_info->GetPrefRegistrationFlags());
+#else
EXPECT_EQ(user_prefs::PrefRegistrySyncable::SYNCABLE_PREF,
website_settings_info->GetPrefRegistrationFlags());
+#endif
// Check the WebsiteSettingsInfo is registered correctly.
EXPECT_EQ(website_settings_registry()->Get(CONTENT_SETTINGS_TYPE_COOKIES),
@@ -86,7 +110,12 @@ TEST_F(ContentSettingsRegistryTest, Iteration) {
}
}
+#if defined(OS_IOS)
+ EXPECT_FALSE(plugins_found);
+#else
EXPECT_TRUE(plugins_found);
+#endif
+
EXPECT_TRUE(cookies_found);
}

Powered by Google App Engine
This is Rietveld 408576698