Ensure settings returned from Content Settings providers are valid

chrome/browser/content_settings/content_settings_policy_provider_unittest.cc

Index: chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
diff --git a/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc b/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
index 433bbd7ab0bd9ecc74f8457d61add2ed48e3c2bc..637c5b5f592100457f92b92437f3eeaeef6ac887 100644
--- a/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
@@ -71,11 +71,11 @@ TEST_F(PolicyProviderTest, ManagedDefaultContentSettings) {
       profile.GetTestingPrefService();
   PolicyProvider provider(prefs);
 
-  prefs->SetManagedPref(prefs::kManagedDefaultPluginsSetting,
+  prefs->SetManagedPref(prefs::kManagedDefaultCookiesSetting,
                         base::MakeUnique<base::Value>(CONTENT_SETTING_BLOCK));
 
   std::unique_ptr<RuleIterator> rule_iterator(provider.GetRuleIterator(
-      CONTENT_SETTINGS_TYPE_PLUGINS, std::string(), false));
+      CONTENT_SETTINGS_TYPE_COOKIES, std::string(), false));
   EXPECT_TRUE(rule_iterator->HasNext());
   Rule rule = rule_iterator->Next();
   EXPECT_FALSE(rule_iterator->HasNext());
@@ -140,7 +140,7 @@ TEST_F(PolicyProviderTest, ObserveManagedSettingsChange) {
   provider.AddObserver(&mock_observer);
 
   // Set the managed default-content-setting.
-  prefs->SetManagedPref(prefs::kManagedDefaultImagesSetting,
+  prefs->SetManagedPref(prefs::kManagedDefaultCookiesSetting,
                         base::MakeUnique<base::Value>(CONTENT_SETTING_BLOCK));
   ::testing::Mock::VerifyAndClearExpectations(&mock_observer);
   EXPECT_CALL(mock_observer,
@@ -149,7 +149,7 @@ TEST_F(PolicyProviderTest, ObserveManagedSettingsChange) {
                                       CONTENT_SETTINGS_TYPE_DEFAULT,
                                       ""));
   // Remove the managed default-content-setting.
-  prefs->RemoveManagedPref(prefs::kManagedDefaultImagesSetting);
+  prefs->RemoveManagedPref(prefs::kManagedDefaultCookiesSetting);
   provider.ShutdownOnUIThread();
 }
 
@@ -281,4 +281,23 @@ TEST_F(PolicyProviderTest, AutoSelectCertificateList) {
   provider.ShutdownOnUIThread();
 }
 
+TEST_F(PolicyProviderTest, InvalidManagedDefaultContentSetting) {
+  TestingProfile profile;
+  sync_preferences::TestingPrefServiceSyncable* prefs =
+      profile.GetTestingPrefService();
+  PolicyProvider provider(prefs);
+
+  prefs->SetManagedPref(
+      prefs::kManagedDefaultCookiesSetting,
+      base::MakeUnique<base::Value>(CONTENT_SETTING_DETECT_IMPORTANT_CONTENT));
+
+  // The setting provided in the cookies pref is not valid for cookies. It
+  // should be ignored.
+  std::unique_ptr<RuleIterator> rule_iterator(provider.GetRuleIterator(
+      CONTENT_SETTINGS_TYPE_COOKIES, std::string(), false));
+  EXPECT_FALSE(rule_iterator);
+
+  provider.ShutdownOnUIThread();
+}
+
 }  // namespace content_settings