Delete Alloy bootstrap (fixes #3685)

patch/patches/chrome_browser_content_settings.patch

@@ -1,60 +1,3 @@
-diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc
-index a344dc5c74ce3..548e6218b0e82 100644
---- chrome/browser/content_settings/host_content_settings_map_factory.cc
-+++ chrome/browser/content_settings/host_content_settings_map_factory.cc
-@@ -9,6 +9,7 @@
- #include "base/feature_list.h"
- #include "build/build_config.h"
- #include "build/buildflag.h"
-+#include "cef/libcef/features/runtime.h"
- #include "chrome/browser/content_settings/one_time_permission_provider.h"
- #include "chrome/browser/permissions/one_time_permissions_tracker_factory.h"
- #include "chrome/browser/profiles/off_the_record_profile_impl.h"
-@@ -27,6 +28,10 @@
- #include "extensions/buildflags/buildflags.h"
- #include "ui/webui/webui_allowlist_provider.h"
- 
-+#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-+#include "cef/libcef/common/extensions/extensions_util.h"
-+#endif
-+
- #if BUILDFLAG(ENABLE_EXTENSIONS)
- #include "base/trace_event/trace_event.h"
- #include "extensions/browser/api/content_settings/content_settings_custom_extension_provider.h"
-@@ -60,7 +65,13 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory()
- #endif
-   DependsOn(OneTimePermissionsTrackerFactory::GetInstance());
- #if BUILDFLAG(ENABLE_EXTENSIONS)
-+#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-+  if (!cef::IsAlloyRuntimeEnabled() || extensions::ExtensionsEnabled()) {
-+#endif
-   DependsOn(extensions::ContentSettingsService::GetFactoryInstance());
-+#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-+  }
-+#endif
- #endif
-   // Used by way of ShouldRestoreOldSessionCookies().
- #if BUILDFLAG(ENABLE_SESSION_SERVICE)
-@@ -113,6 +124,9 @@ scoped_refptr<RefcountedKeyedService>
-                                  std::move(allowlist_provider));
- 
- #if BUILDFLAG(ENABLE_EXTENSIONS)
-+#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-+  if (!cef::IsAlloyRuntimeEnabled() || extensions::ExtensionsEnabled()) {
-+#endif
-   // These must be registered before before the HostSettings are passed over to
-   // the IOThread.  Simplest to do this on construction.
-   settings_map->RegisterProvider(
-@@ -125,6 +139,9 @@ scoped_refptr<RefcountedKeyedService>
-           // the case where profile->IsOffTheRecord() is true? And what is the
-           // interaction with profile->IsGuestSession()?
-           false));
-+#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-+  }
-+#endif
- #endif // BUILDFLAG(ENABLE_EXTENSIONS)
-   supervised_user::SupervisedUserSettingsService* supervised_service =
-       SupervisedUserSettingsServiceFactory::GetForKey(profile->GetProfileKey());
 diff --git components/content_settings/renderer/content_settings_agent_impl.cc components/content_settings/renderer/content_settings_agent_impl.cc
 index 0cc2bfa06245f..86655f6746459 100644
 --- components/content_settings/renderer/content_settings_agent_impl.cc