1 files changed, 0 insertions, 122 deletions
diff --git a/devel/electron35/files/patch-content_utility_utility__main.cc b/devel/electron35/files/patch-content_utility_utility__main.cc
deleted file mode 100644
index eba19c423cab..000000000000
--- a/devel/electron35/files/patch-content_utility_utility__main.cc
+++ /dev/null
@@ -1,122 +0,0 @@
---- content/utility/utility_main.cc.orig	2025-03-24 20:50:14 UTC
-+++ content/utility/utility_main.cc
-@@ -36,18 +36,22 @@
- #include "services/tracing/public/cpp/trace_startup.h"
- #include "services/video_effects/public/cpp/buildflags.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/file_descriptor_store.h"
- #include "base/files/file_util.h"
- #include "base/pickle.h"
- #include "content/child/sandboxed_process_thread_type_handler.h"
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "content/common/gpu_pre_sandbox_hook_linux.h"
-+#endif
- #include "content/public/common/content_descriptor_keys.h"
- #include "content/utility/speech/speech_recognition_sandbox_hook_linux.h"
- #include "gpu/config/gpu_info_collector.h"
- #include "media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h"
- #include "media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h"
-+#if !BUILDFLAG(IS_BSD)
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#endif
- #include "services/audio/audio_sandbox_hook_linux.h"
- #include "services/network/network_sandbox_hook_linux.h"
- #include "services/screen_ai/buildflags/buildflags.h"
-@@ -66,7 +70,12 @@
- 
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#include "content/common/gpu_pre_sandbox_hook_bsd.h"
-+#endif
-+
-+#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
- #include "services/video_effects/video_effects_sandbox_hook_linux.h"  // nogncheck
- #endif  // BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX)
- 
-@@ -101,7 +110,7 @@ sandbox::TargetServices* g_utility_target_services = n
- sandbox::TargetServices* g_utility_target_services = nullptr;
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
- #include "components/services/on_device_translation/sandbox_hook.h"
- #endif  // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && BUILDFLAG(IS_LINUX)
- 
-@@ -109,7 +118,7 @@ namespace {
- 
- namespace {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- std::vector<std::string> GetNetworkContextsParentDirectories() {
-   base::MemoryMappedFile::Region region;
-   base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD(
-@@ -247,7 +256,8 @@ int UtilityMain(MainFunctionParams parameters) {
-     CHECK(on_device_model::OnDeviceModelService::PreSandboxInit());
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+// XXX BSD
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
-   // Thread type delegate of the process should be registered before first
-   // thread type change in ChildProcess constructor. It also needs to be
-   // registered before the process has multiple threads, which may race with
-@@ -255,7 +265,7 @@ int UtilityMain(MainFunctionParams parameters) {
-   SandboxedProcessThreadTypeHandler::Create();
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Initializes the sandbox before any threads are created.
-   // TODO(jorgelo): move this after GTK initialization when we enable a strict
-   // Seccomp-BPF policy.
-@@ -287,7 +297,7 @@ int UtilityMain(MainFunctionParams parameters) {
-       pre_sandbox_hook =
-           base::BindOnce(&speech::SpeechRecognitionPreSandboxHook);
-       break;
--#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
-     case sandbox::mojom::Sandbox::kOnDeviceTranslation:
-       pre_sandbox_hook = base::BindOnce(
-           &on_device_translation::OnDeviceTranslationSandboxHook);
-@@ -303,13 +313,13 @@ int UtilityMain(MainFunctionParams parameters) {
- #else
-       NOTREACHED();
- #endif
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     case sandbox::mojom::Sandbox::kVideoEffects:
-       pre_sandbox_hook =
-           base::BindOnce(&video_effects::VideoEffectsPreSandboxHook);
-       break;
- #endif  // BUILDFLAG(IS_LINUX)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     case sandbox::mojom::Sandbox::kHardwareVideoDecoding:
-       pre_sandbox_hook =
-           base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook);
-@@ -336,6 +346,7 @@ int UtilityMain(MainFunctionParams parameters) {
-     default:
-       break;
-   }
-+#if !BUILDFLAG(IS_BSD)
-   if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) &&
-       (parameters.zygote_child || !pre_sandbox_hook.is_null())) {
-     sandbox_options.use_amd_specific_policies =
-@@ -343,6 +354,11 @@ int UtilityMain(MainFunctionParams parameters) {
-     sandbox::policy::Sandbox::Initialize(
-         sandbox_type, std::move(pre_sandbox_hook), sandbox_options);
-   }
-+#else
-+  sandbox::policy::Sandbox::Initialize(
-+      sandbox_type, std::move(pre_sandbox_hook),
-+      sandbox::policy::SandboxLinux::Options());
-+#endif
- 
-   // Start the HangWatcher now that the sandbox is engaged, if it hasn't
-   // already been started.