1diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc 2index 242f244a6d3b5..d037f2dfd9987 100644 3--- chrome/browser/content_settings/host_content_settings_map_factory.cc 4+++ chrome/browser/content_settings/host_content_settings_map_factory.cc 5@@ -9,6 +9,7 @@ 6 #include "base/feature_list.h" 7 #include "build/build_config.h" 8 #include "build/buildflag.h" 9+#include "cef/libcef/features/runtime.h" 10 #include "chrome/browser/content_settings/one_time_geolocation_permission_provider.h" 11 #include "chrome/browser/permissions/last_tab_standing_tracker_factory.h" 12 #include "chrome/browser/profiles/off_the_record_profile_impl.h" 13@@ -23,6 +24,10 @@ 14 #include "extensions/buildflags/buildflags.h" 15 #include "ui/webui/webui_allowlist_provider.h" 16 17+#if BUILDFLAG(ENABLE_CEF) 18+#include "cef/libcef/common/extensions/extensions_util.h" 19+#endif 20+ 21 #if BUILDFLAG(ENABLE_EXTENSIONS) 22 #include "base/trace_event/trace_event.h" 23 #include "extensions/browser/api/content_settings/content_settings_custom_extension_provider.h" 24@@ -55,7 +60,13 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory() 25 DependsOn(SupervisedUserSettingsServiceFactory::GetInstance()); 26 #endif 27 #if BUILDFLAG(ENABLE_EXTENSIONS) 28+#if BUILDFLAG(ENABLE_CEF) 29+ if (!cef::IsAlloyRuntimeEnabled() || extensions::ExtensionsEnabled()) { 30+#endif 31 DependsOn(extensions::ContentSettingsService::GetFactoryInstance()); 32+#if BUILDFLAG(ENABLE_CEF) 33+ } 34+#endif 35 #endif 36 // Used by way of ShouldRestoreOldSessionCookies(). 37 #if BUILDFLAG(ENABLE_SESSION_SERVICE) 38@@ -119,6 +130,9 @@ scoped_refptr<RefcountedKeyedService> 39 } 40 41 #if BUILDFLAG(ENABLE_EXTENSIONS) 42+#if BUILDFLAG(ENABLE_CEF) 43+ if (!cef::IsAlloyRuntimeEnabled() || extensions::ExtensionsEnabled()) { 44+#endif 45 // These must be registered before before the HostSettings are passed over to 46 // the IOThread. Simplest to do this on construction. 47 settings_map->RegisterProvider( 48@@ -131,6 +145,9 @@ scoped_refptr<RefcountedKeyedService> 49 // the case where profile->IsOffTheRecord() is true? And what is the 50 // interaction with profile->IsGuestSession()? 51 false)); 52+#if BUILDFLAG(ENABLE_CEF) 53+ } 54+#endif 55 #endif // BUILDFLAG(ENABLE_EXTENSIONS) 56 #if BUILDFLAG(ENABLE_SUPERVISED_USERS) 57 SupervisedUserSettingsService* supervised_service = 58diff --git components/content_settings/renderer/content_settings_agent_impl.cc components/content_settings/renderer/content_settings_agent_impl.cc 59index e11724a73a2f7..ad818bc3ae082 100644 60--- components/content_settings/renderer/content_settings_agent_impl.cc 61+++ components/content_settings/renderer/content_settings_agent_impl.cc 62@@ -166,7 +166,7 @@ ContentSetting GetContentSettingFromRulesImpl( 63 return rule.GetContentSetting(); 64 } 65 } 66- NOTREACHED(); 67+ // NOTREACHED(); 68 return CONTENT_SETTING_DEFAULT; 69 } 70 71