Ensure settings returned from Content Settings providers are valid

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
 
 #include <memory>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 198 matching lines @@
           ->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,
   // some values might not be supported.
   // For example, camera supports [allow, ask, block] for exceptions, but only
   // [ask, block] for the default setting.
   if (primary_pattern == ContentSettingsPattern::Wildcard() &&
       secondary_pattern == ContentSettingsPattern::Wildcard() &&
-      !HostContentSettingsMap::IsDefaultSettingAllowedForType(setting,
-                                                              content_type)) {
+      !content_settings::ContentSettingsRegistry::GetInstance()
+           ->Get(content_type)
+           ->IsDefaultSettingValid(setting)) {
     static const char kUnsupportedDefaultSettingError[] =
         "'%s' is not supported as the default setting of %s.";
 
     // TODO(msramek): Get the same human readable name as is presented
     // externally in the API, i.e. chrome.contentSettings.<name>.set().
     std::string readable_type_name;
     if (content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {
       readable_type_name = "microphone";
     } else if (content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) {
       readable_type_name = "camera";
@@ skipping 77 matching lines @@
   SetResult(std::move(list));
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::BindOnce(
           &ContentSettingsContentSettingGetResourceIdentifiersFunction::
               SendResponse,
           this, true));
 }
 
 }  // namespace extensions