Ensure settings returned from Content Settings providers are valid

components/content_settings/core/browser/content_settings_policy_provider.cc

Index: components/content_settings/core/browser/content_settings_policy_provider.cc
diff --git a/components/content_settings/core/browser/content_settings_policy_provider.cc b/components/content_settings/core/browser/content_settings_policy_provider.cc
index c2967aa41a68010245b9793394eef5705b3f06b6..d6548ce12ab372c93fcc8d1e2968c5e2e79e3d7e 100644
--- a/components/content_settings/core/browser/content_settings_policy_provider.cc
+++ b/components/content_settings/core/browser/content_settings_policy_provider.cc
@@ -13,6 +13,8 @@
 #include "base/json/json_reader.h"
 #include "base/macros.h"
 #include "base/values.h"
+#include "components/content_settings/core/browser/content_settings_info.h"
+#include "components/content_settings/core/browser/content_settings_registry.h"
 #include "components/content_settings/core/browser/content_settings_rule.h"
 #include "components/content_settings/core/browser/content_settings_utils.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
@@ -356,9 +358,14 @@ void PolicyProvider::UpdateManagedDefaultSetting(
                            ContentSettingsPattern::Wildcard(),
                            entry.content_type, std::string());
   } else {

[msramek, 2017/05/03 20:05:42]

style: } else if {

[raymes, 2017/05/04 05:49:14]

Done.

-    value_map_.SetValue(ContentSettingsPattern::Wildcard(),
-                        ContentSettingsPattern::Wildcard(), entry.content_type,
-                        std::string(), new base::Value(setting));
+    if (ContentSettingsRegistry::GetInstance()
+            ->Get(entry.content_type)
+            ->IsSettingValid(IntToContentSetting(setting))) {
+      value_map_.SetValue(ContentSettingsPattern::Wildcard(),
+                          ContentSettingsPattern::Wildcard(),
+                          entry.content_type, std::string(),
+                          new base::Value(setting));
+    }
   }
 }