1 files changed, 9 insertions, 16 deletions
diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
index e948fb0ebca3..a7f2d06d96eb 100644
--- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc
+++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
@@ -1,4 +1,4 @@
---- content/app/content_main_runner_impl.cc.orig	2022-02-28 16:54:41 UTC
+--- content/app/content_main_runner_impl.cc.orig	2022-03-25 21:59:56 UTC
 +++ content/app/content_main_runner_impl.cc
 @@ -130,13 +130,13 @@
  #include "base/posix/global_descriptors.h"
@@ -27,7 +27,7 @@
  #if BUILDFLAG(IS_ANDROID)
  #include "base/system/sys_info.h"
  #include "components/power_scheduler/power_scheduler.h"
-@@ -335,7 +339,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -340,7 +344,7 @@ void InitializeZygoteSandboxForBrowserProcess(
  }
  #endif  // BUILDFLAG(USE_ZYGOTE_HANDLE)
  
@@ -36,23 +36,16 @@
  
  #if BUILDFLAG(ENABLE_PLUGINS)
  // Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -371,11 +375,14 @@ void PreloadLibraryCdms() {
+@@ -376,7 +380,7 @@ void PreloadLibraryCdms() {
  }
  #endif  // BUILDFLAG(ENABLE_LIBRARY_CDMS)
  
 -#if BUILDFLAG(USE_ZYGOTE_HANDLE)
 +#if BUILDFLAG(USE_ZYGOTE_HANDLE) || BUILDFLAG(IS_BSD)
  void PreSandboxInit() {
-+  // arc4random
-+#if !BUILDFLAG(IS_BSD) 
    // Pre-acquire resources needed by BoringSSL. See
    // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md
-   CRYPTO_pre_sandbox_init();
-+#endif
- 
- #if BUILDFLAG(ENABLE_PLUGINS)
-   // Ensure access to the Pepper plugins before the sandbox is turned on.
-@@ -387,6 +394,11 @@ void PreSandboxInit() {
+@@ -392,6 +396,11 @@ void PreSandboxInit() {
  #endif
    InitializeWebRtcModule();
  
@@ -64,7 +57,7 @@
    // Set the android SkFontMgr for blink. We need to ensure this is done
    // before the sandbox is initialized to allow the font manager to access
    // font configuration files on disk.
-@@ -556,7 +568,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* 
+@@ -561,7 +570,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* 
    delegate->ZygoteStarting(&zygote_fork_delegates);
    media::InitializeMediaLibrary();
  
@@ -73,7 +66,7 @@
    PreSandboxInit();
  #endif
  
-@@ -732,11 +744,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -747,11 +756,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
               kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -87,7 +80,7 @@
  
  #endif  // !BUILDFLAG(IS_WIN)
  
-@@ -925,6 +936,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -949,6 +957,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
    }
  #endif
  
@@ -104,7 +97,7 @@
    delegate_->SandboxInitialized(process_type);
  
  #if BUILDFLAG(USE_ZYGOTE_HANDLE)
-@@ -980,7 +1001,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1004,7 +1022,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
        mojo::core::InitFeatures();
      }
  
@@ -113,7 +106,7 @@
      // If dynamic Mojo Core is being used, ensure that it's loaded very early in
      // the child/zygote process, before any sandbox is initialized. The library
      // is not fully initialized with IPC support until a ChildProcess is later
-@@ -1013,6 +1034,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1037,6 +1055,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
    content_main_params_.reset();
  
    RegisterMainThreadFactories();