Remove HostContentSettingsMap::IsSettingAllowedForType

chrome/browser/extensions/api/content_settings/content_settings_api.cc

Index: chrome/browser/extensions/api/content_settings/content_settings_api.cc
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
index 0030797ab026950e9cab4f087aa0ec9dcef5816f..18930f43a9008a3001483b0b8bc29607b95ea684 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
@@ -25,6 +25,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/content_settings.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/cookie_settings.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/plugin_service.h"
@@ -209,8 +211,10 @@ bool ContentSettingsContentSettingSetFunction::RunSync() {
   ContentSetting setting;
   EXTENSION_FUNCTION_VALIDATE(
       helpers::StringToContentSetting(setting_str, &setting));
-  EXTENSION_FUNCTION_VALIDATE(HostContentSettingsMap::IsSettingAllowedForType(
-      GetProfile()->GetPrefs(), setting, content_type));
+  EXTENSION_FUNCTION_VALIDATE(
+      content_settings::ContentSettingsRegistry::GetInstance()
+          ->Get(content_type)
+          ->IsSettingValid(setting));
 
   // Some content setting types support the full set of values listed in
   // content_settings.json only for exceptions. For the default setting,
@@ -219,8 +223,8 @@ bool ContentSettingsContentSettingSetFunction::RunSync() {
   // [ask, block] for the default setting.
   if (primary_pattern == ContentSettingsPattern::Wildcard() &&
       secondary_pattern == ContentSettingsPattern::Wildcard() &&
-      !HostContentSettingsMap::IsDefaultSettingAllowedForType(
-          GetProfile()->GetPrefs(), setting, content_type)) {
+      !HostContentSettingsMap::IsDefaultSettingAllowedForType(setting,
+                                                              content_type)) {
     static const char kUnsupportedDefaultSettingError[] =
         "'%s' is not supported as the default setting of %s.";