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

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: Created 4 years, 7 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..471cd1e849cca94d3467b1a452ca96a1bf2447d1 100644
--- a/components/content_settings/core/browser/content_settings_registry_unittest.cc
+++ b/components/content_settings/core/browser/content_settings_registry_unittest.cc
@@ -62,8 +62,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 +91,12 @@ TEST_F(ContentSettingsRegistryTest, Iteration) {
}
}
+#if defined(OS_ANDROID) || 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