diff --git a/patches/chromium/.patches b/patches/chromium/.patches index fc294687eb357..c68439f8fb5bb 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -66,7 +66,6 @@ fix_export_zlib_symbols.patch web_contents.patch webview_fullscreen.patch disable_unload_metrics.patch -fix_add_check_for_sandbox_then_result.patch extend_apply_webpreferences.patch build_libc_as_static_library.patch build_do_not_depend_on_packed_resource_integrity.patch diff --git a/patches/chromium/fix_add_check_for_sandbox_then_result.patch b/patches/chromium/fix_add_check_for_sandbox_then_result.patch deleted file mode 100644 index c14035d87100b..0000000000000 --- a/patches/chromium/fix_add_check_for_sandbox_then_result.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Samuel Attard -Date: Wed, 3 Mar 2021 15:52:46 -0800 -Subject: fix: add CHECK for sandbox then_result - -It fixes things, we do not know why, we should look at reverting this -patch and doing further investigation in the future. This patch cannot -be upstreamed. - -diff --git a/sandbox/linux/bpf_dsl/bpf_dsl.cc b/sandbox/linux/bpf_dsl/bpf_dsl.cc -index b016a525f274c229f5f1365c6a7e462c8cff0242..31e1b9cd107d659ca79949f970bf0e077bdad340 100644 ---- a/sandbox/linux/bpf_dsl/bpf_dsl.cc -+++ b/sandbox/linux/bpf_dsl/bpf_dsl.cc -@@ -314,6 +314,7 @@ Elser::Elser(const Elser& elser) = default; - Elser::~Elser() = default; - - Elser Elser::ElseIf(BoolExpr cond, ResultExpr then_result) const { -+ CHECK(then_result); - return Elser(Cons(std::make_pair(std::move(cond), std::move(then_result)), - clause_list_)); - }