chore: update patches

2021-03-15 14:32:18 -04:00 · 2021-03-15 14:32:18 -04:00 · 1e16606524
--- a/patches/boringssl/expose_aes-cfb.patch
+++ b/patches/boringssl/expose_aes-cfb.patch
@ -57,7 +57,7 @@ index 53cb9d2dc8f1962a70dc12b648d27c32be8aca4b..84af06fc56e4aa72d4d48801d7c037ad
   callback(EVP_aes_192_ctr(), "aes-192-ctr", NULL, arg);
   callback(EVP_aes_256_ctr(), "aes-256-ctr", NULL, arg);
 diff --git a/include/openssl/cipher.h b/include/openssl/cipher.h
-index 3feadea85aa2f60b3c4e2956040cf015a72aa5b1..988f98fb7cdc564cafc4d0d3fe1dd777e278b26e 100644
+index badd496293fb9748adacff10478ea702d1155c5f..8565934bac9a810281b04946cb9f38d7623320f7 100644
 --- a/include/openssl/cipher.h
 +++ b/include/openssl/cipher.h
@@ -430,6 +430,7 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_des_ede3_ecb(void);
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@ -50,7 +50,6 @@ fix_disable_usage_of_abort_report_np_in_mas_builds.patch
 fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch
 fix_disable_usage_of_setapplicationisdaemon_and.patch
 unsandboxed_ppapi_processes_skip_zygote.patch
-patch_the_ensure_gn_version_py_script_to_work_on_mac_ci.patch
 build_add_electron_tracing_category.patch
 worker_context_will_destroy.patch
 frame_host_manager.patch
--- a/patches/chromium/accelerator.patch
+++ b/patches/chromium/accelerator.patch
@ -10,7 +10,7 @@ This patch makes three changes to Accelerator::GetShortcutText to improve shortc
 3. Ctrl-Shift-= should show as Ctrl-+

 diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
-index 17e1739c12ee38864e735130792321adadb43f08..7b0bfec6f18e883eb7ad7e3bfe564163592f584e 100644
+index 1a2a154b743cd4ecccf1be9971f36896e982dc6e..cbd5ce0929b956456424c4e6a159418f7eb91638 100644
 --- a/ui/base/accelerators/accelerator.cc
 +++ b/ui/base/accelerators/accelerator.cc
@@ -12,6 +12,7 @@
@ -31,7 +31,7 @@ index 17e1739c12ee38864e735130792321adadb43f08..7b0bfec6f18e883eb7ad7e3bfe564163
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 #include "ui/base/ui_base_features.h"
-@@ -205,7 +204,15 @@ base::string16 Accelerator::GetShortcutText() const {
+@@ -205,7 +204,15 @@ std::u16string Accelerator::GetShortcutText() const {
   shortcut = KeyCodeToName();
 #endif
 
@ -47,7 +47,7 @@ index 17e1739c12ee38864e735130792321adadb43f08..7b0bfec6f18e883eb7ad7e3bfe564163
 #if defined(OS_WIN)
     // Our fallback is to try translate the key code to a regular character
     // unless it is one of digits (VK_0 to VK_9). Some keyboard
-@@ -214,21 +221,14 @@ base::string16 Accelerator::GetShortcutText() const {
+@@ -214,21 +221,14 @@ std::u16string Accelerator::GetShortcutText() const {
     // accent' for '0'). For display in the menu (e.g. Ctrl-0 for the
     // default zoom level), we leave VK_[0-9] alone without translation.
     wchar_t key;
@ -65,7 +65,7 @@ index 17e1739c12ee38864e735130792321adadb43f08..7b0bfec6f18e883eb7ad7e3bfe564163
 -        UsLayoutKeyboardCodeToDomCode(key_code_), false);
 -    if (c != 0)
 -      shortcut +=
-          static_cast<base::string16::value_type>(base::ToUpperASCII(c));
+-          static_cast<std::u16string::value_type>(base::ToUpperASCII(c));
 +      shortcut = key;
 +    }
 #endif
@ -75,7 +75,7 @@ index 17e1739c12ee38864e735130792321adadb43f08..7b0bfec6f18e883eb7ad7e3bfe564163
   }
 
 #if defined(OS_APPLE)
-@@ -411,7 +411,7 @@ base::string16 Accelerator::ApplyLongFormModifiers(
+@@ -411,7 +411,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
   // more information.
   if (IsCtrlDown())
     shortcut = ApplyModifierToAcceleratorString(shortcut, IDS_APP_CTRL_KEY);
--- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
+++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
 This should be upstreamed.

 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index c6fada5cefbf9ca359be880c5ab747884c7ba4ce..fc4f434c8cb7e231edbf257410f7cc1dab75b0d0 100644
+index 5b4034b583163068c29b9aee3e2b8cd4687c67ed..ee0e1404fc06c591e6f26471d049d0a29d87e7ef 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
-@@ -260,6 +260,10 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -259,6 +259,10 @@ int GpuMain(const MainFunctionParams& parameters) {
   // to the GpuProcessHost once the GpuServiceImpl has started.
   viz::GpuServiceImpl::InstallPreInitializeLogHandler();
 
@ -24,7 +24,7 @@ index c6fada5cefbf9ca359be880c5ab747884c7ba4ce..fc4f434c8cb7e231edbf257410f7cc1d
   // We are experiencing what appear to be memory-stomp issues in the GPU
   // process. These issues seem to be impacting the task executor and listeners
   // registered to it. Create the task executor on the heap to guard against
-@@ -397,7 +401,6 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -396,7 +400,6 @@ int GpuMain(const MainFunctionParams& parameters) {
   }
 #endif
 
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@ -10,10 +10,10 @@ DidCreateScriptContext is called, not all JS APIs are available in the
 context, which can cause some preload scripts to trip.

 diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
-index 68b45e8311053222bda00a43de469d707f566539..aea37e280b490ba29e263403e019454d1bb0bf18 100644
+index 7255ccd1ab7128616ae45c7810a90821496becc0..9ed4547d784ee6e552cc31d7f6091c722218f565 100644
 --- a/content/public/renderer/render_frame_observer.h
 +++ b/content/public/renderer/render_frame_observer.h
-@@ -127,6 +127,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
+@@ -129,6 +129,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
   virtual void DidHandleOnloadEvents() {}
   virtual void DidCreateScriptContext(v8::Local<v8::Context> context,
                                       int32_t world_id) {}
@ -23,10 +23,10 @@ index 68b45e8311053222bda00a43de469d707f566539..aea37e280b490ba29e263403e019454d
                                         int32_t world_id) {}
   virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index cddf3397e3149cb6192871dbac94b4914a216220..adac4b9b2b73be64495dbbb858af5402523bb59b 100644
+index 0970915229d119d5d45041a9b21846b054f6d1ae..2d6f936ade9cb1baceeea038df48e92f4ab3783a 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4542,6 +4542,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4578,6 +4578,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
     observer.DidCreateScriptContext(context, world_id);
 }
 
@ -40,10 +40,10 @@ index cddf3397e3149cb6192871dbac94b4914a216220..adac4b9b2b73be64495dbbb858af5402
                                                int world_id) {
   for (auto& observer : observers_)
 diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
-index bc6ba9e052143dae239248cfbe585249a5e541a0..5dbd5e061009dd4360b54e9f24ec76c6592c5b6f 100644
+index 9ab20deefcc7339a783e9d922c55f42840cbbf8f..52e763e8cf62ea9c5e6025d2fedd66eb8c9c8470 100644
 --- a/content/renderer/render_frame_impl.h
 +++ b/content/renderer/render_frame_impl.h
-@@ -593,6 +593,8 @@ class CONTENT_EXPORT RenderFrameImpl
+@@ -597,6 +597,8 @@ class CONTENT_EXPORT RenderFrameImpl
       blink::WebLocalFrameClient::LazyLoadBehavior lazy_load_behavior) override;
   void DidCreateScriptContext(v8::Local<v8::Context> context,
                               int world_id) override;
@ -53,10 +53,10 @@ index bc6ba9e052143dae239248cfbe585249a5e541a0..5dbd5e061009dd4360b54e9f24ec76c6
                                 int world_id) override;
   void DidChangeScrollOffset() override;
 diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
-index ea4b3ed3bacf4b65776f654de49f30825ba38e16..fdb2973d1123a94b0322b3fee874536f7851c05f 100644
+index fd8b154d7a38a6444dd6ceea93b422918561d0f4..8deaf19c88fdeab5ccf7bf24a086094d255e5a1a 100644
 --- a/third_party/blink/public/web/web_local_frame_client.h
 +++ b/third_party/blink/public/web/web_local_frame_client.h
-@@ -566,6 +566,9 @@ class BLINK_EXPORT WebLocalFrameClient {
+@@ -571,6 +571,9 @@ class BLINK_EXPORT WebLocalFrameClient {
   virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                       int32_t world_id) {}
 
@ -79,10 +79,10 @@ index be5cf4457cd379d5abc119d209d2df6520ad1022..8a0baac5bb8cb403324fb8156be62b92
   if (World().IsMainWorld()) {
     GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
-index 59bae1425ae816c727ea8da5b15ef171b8947520..d748d8cae61c7523568d7855bd7677abff9638e8 100644
+index 20a509a57d8916f8fb522575e7a5dd9c2f8a9092..60193a0e5e369b09d59379415d06a74d268d0590 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client.h
-@@ -295,6 +295,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
+@@ -294,6 +294,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
 
   virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                       int32_t world_id) = 0;
@ -92,10 +92,10 @@ index 59bae1425ae816c727ea8da5b15ef171b8947520..d748d8cae61c7523568d7855bd7677ab
                                         int32_t world_id) = 0;
   virtual bool AllowScriptExtensions() = 0;
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
-index ef047d63ce4d1b72f85f1ddceeef44e80719c102..74a9c38e4cbe900f1c2da21d7357da3bafec7175 100644
+index 76a5edbafc727c8760c4cc12d9279fb96fde3740..205cbc9f1f629e10a92d2b86a65460fd115a2149 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
-@@ -274,6 +274,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
+@@ -272,6 +272,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
     web_frame_->Client()->DidCreateScriptContext(context, world_id);
 }
 
@ -110,7 +110,7 @@ index ef047d63ce4d1b72f85f1ddceeef44e80719c102..74a9c38e4cbe900f1c2da21d7357da3b
     v8::Local<v8::Context> context,
     int32_t world_id) {
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
-index ef43b90303b7546d1163209cbade473b8cf17091..246ec76f84219390753b72778a18c8e2dec8bfdc 100644
+index 244a0028b7a6d14e3eb30041b36c9ef49b61018a..ea98189f0f03a9099d6963fe0fb3ae8fb0548c64 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
@@ -76,6 +76,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
@ -123,10 +123,10 @@ index ef43b90303b7546d1163209cbade473b8cf17091..246ec76f84219390753b72778a18c8e2
                                 int32_t world_id) override;
 
 diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
-index 26520031e93bb4de9b0e12faed1cd67da5660a26..e90550d6f60b8d91701aa1a16524ed28849dda3d 100644
+index 10a75b729c365f04545888c92c811e2da6c59919..43ad2a74d904d74fd6c39a61aa73093e5296510e 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
-@@ -348,6 +348,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
+@@ -344,6 +344,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
 
   void DidCreateScriptContext(v8::Local<v8::Context>,
                               int32_t world_id) override {}
--- a/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch
+++ b/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch
@ -10,7 +10,7 @@ WebContents, and cancels the authentication if there's no WebContents
 available, which there isn't in the case of the 'net' module.

 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index cfa9d0c197ca9851f13b088ecae4aba614c7ac55..d93a6ce481630535b75d858e5b7b04e50f81e2f8 100644
+index b35746e2850d7d724fcf3dc09ddbfea1ca56a746..491172c51c2d196573f2e835f7b81df30a33cf2f 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
@@ -192,6 +192,26 @@ struct CTPolicy {
@ -40,7 +40,7 @@ index cfa9d0c197ca9851f13b088ecae4aba614c7ac55..d93a6ce481630535b75d858e5b7b04e5
 interface CertVerifierClient {
   Verify(
     int32 default_error,
-@@ -623,6 +643,8 @@ struct URLLoaderFactoryParams {
+@@ -606,6 +626,8 @@ struct URLLoaderFactoryParams {
   // impact because of the extra process hops, so use should be minimized.
   pending_remote<TrustedURLLoaderHeaderClient>? header_client;
 
@ -50,12 +50,12 @@ index cfa9d0c197ca9851f13b088ecae4aba614c7ac55..d93a6ce481630535b75d858e5b7b04e5
   // cookies) and to shard network resources, like the cache. If set, takes
   // precedence over ResourceRequest::TrustedParams::IsolationInfo field
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index ce483753dff0130c5ac20258c0cf7e399c0d1c51..0e31b92419e124136447efc6a1642ade5eaa0a5e 100644
+index 136c4ec48412354cbc3d77880dd34ec836694004..f484bb54c59866d13e532cd81ed28ad9f982549a 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
-@@ -463,6 +463,7 @@ URLLoader::URLLoader(
+@@ -465,6 +465,7 @@ URLLoader::URLLoader(
+     scoped_refptr<ResourceSchedulerClient> resource_scheduler_client,
     base::WeakPtr<KeepaliveStatisticsRecorder> keepalive_statistics_recorder,
-     base::WeakPtr<NetworkUsageAccumulator> network_usage_accumulator,
     mojom::TrustedURLLoaderHeaderClient* url_loader_header_client,
 +    mojom::TrustedURLLoaderAuthClient* url_loader_auth_client,
     mojom::OriginPolicyManager* origin_policy_manager,
@ -73,20 +73,20 @@ index ce483753dff0130c5ac20258c0cf7e399c0d1c51..0e31b92419e124136447efc6a1642ade
   if (want_raw_headers_) {
     options_ |= mojom::kURLLoadOptionSendSSLInfoWithResponse |
                 mojom::kURLLoadOptionSendSSLInfoForCertificateError;
-@@ -1189,7 +1195,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
-     // |this| may have been deleted.
+@@ -1198,7 +1204,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
     return;
   }
-  if (!auth_cert_observer_) {
-+  if (!auth_cert_observer_ && !auth_client_) {
+   auto* url_loader_network_observer = GetURLLoaderNetworkServiceObserver();
+-  if (!url_loader_network_observer) {
+  if (!url_loader_network_observer && !auth_client_) {
     OnAuthCredentials(base::nullopt);
     return;
   }
-@@ -1201,10 +1207,22 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
+@@ -1210,10 +1216,22 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
 
   DCHECK(!auth_challenge_responder_receiver_.is_bound());
 
-  auth_cert_observer_->OnAuthRequired(
+-  url_loader_network_observer->OnAuthRequired(
 -      fetch_window_id_, request_id_, url_request_->url(), first_auth_attempt_,
 -      auth_info, url_request->response_headers(),
 -      auth_challenge_responder_receiver_.BindNewPipeAndPassRemote());
@ -101,7 +101,7 @@ index ce483753dff0130c5ac20258c0cf7e399c0d1c51..0e31b92419e124136447efc6a1642ade
 +        std::move(head),
 +        auth_challenge_responder_receiver_.BindNewPipeAndPassRemote());
 +  } else {
-+    auth_cert_observer_->OnAuthRequired(
+    url_loader_network_observer->OnAuthRequired(
 +        fetch_window_id_, request_id_, url_request_->url(), first_auth_attempt_,
 +        auth_info, url_request->response_headers(),
 +        auth_challenge_responder_receiver_.BindNewPipeAndPassRemote());
@ -110,18 +110,18 @@ index ce483753dff0130c5ac20258c0cf7e399c0d1c51..0e31b92419e124136447efc6a1642ade
   auth_challenge_responder_receiver_.set_disconnect_handler(
       base::BindOnce(&URLLoader::DeleteSelf, base::Unretained(this)));
 diff --git a/services/network/url_loader.h b/services/network/url_loader.h
-index 21ec3b43cd58c738b281b3d51dde6879bb7619df..7c607c68ec27af31238537fd1943015d72c30a18 100644
+index f8c6112335ea43912485e76ec48d28b8609fab83..25c17fc78a03ba6a0b1a399e22bbba827e2275fb 100644
 --- a/services/network/url_loader.h
 +++ b/services/network/url_loader.h
-@@ -130,6 +130,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
+@@ -128,6 +128,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
+       scoped_refptr<ResourceSchedulerClient> resource_scheduler_client,
       base::WeakPtr<KeepaliveStatisticsRecorder> keepalive_statistics_recorder,
-       base::WeakPtr<NetworkUsageAccumulator> network_usage_accumulator,
       mojom::TrustedURLLoaderHeaderClient* url_loader_header_client,
 +      mojom::TrustedURLLoaderAuthClient* url_loader_auth_client,
       mojom::OriginPolicyManager* origin_policy_manager,
       std::unique_ptr<TrustTokenRequestHelperFactory>
           trust_token_helper_factory,
-@@ -500,6 +501,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
+@@ -517,6 +518,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
   base::Optional<base::UnguessableToken> fetch_window_id_;
 
   mojo::Remote<mojom::TrustedHeaderClient> header_client_;
@ -130,30 +130,30 @@ index 21ec3b43cd58c738b281b3d51dde6879bb7619df..7c607c68ec27af31238537fd1943015d
   std::unique_ptr<FileOpenerForUpload> file_opener_for_upload_;
 
 diff --git a/services/network/url_loader_factory.cc b/services/network/url_loader_factory.cc
-index af9e13bb4f1fefbda57182069d5d677e23eaed56..5651380c7296eea4a520a0ef4d97ebe1f89ef0e5 100644
+index 766d343375c24c5746fb442370b544a8cf76d58f..627efb08ed0974f0c7672085e46996048af8c244 100644
 --- a/services/network/url_loader_factory.cc
 +++ b/services/network/url_loader_factory.cc
-@@ -77,6 +77,7 @@ URLLoaderFactory::URLLoaderFactory(
+@@ -76,6 +76,7 @@ URLLoaderFactory::URLLoaderFactory(
       resource_scheduler_client_(std::move(resource_scheduler_client)),
       header_client_(std::move(params_->header_client)),
       coep_reporter_(std::move(params_->coep_reporter)),
 +      auth_client_(std::move(params_->auth_client)),
       cors_url_loader_factory_(cors_url_loader_factory),
       cookie_observer_(std::move(params_->cookie_observer)),
-       auth_cert_observer_(std::move(params_->auth_cert_observer)),
-@@ -305,6 +306,7 @@ void URLLoaderFactory::CreateLoaderAndStart(
+       url_loader_network_service_observer_(
+@@ -279,6 +280,7 @@ void URLLoaderFactory::CreateLoaderAndStart(
+       context_->require_network_isolation_key(), resource_scheduler_client_,
       std::move(keepalive_statistics_recorder),
-       std::move(network_usage_accumulator),
       header_client_.is_bound() ? header_client_.get() : nullptr,
 +      auth_client_.is_bound() ? auth_client_.get() : nullptr,
       context_->origin_policy_manager(), std::move(trust_token_factory),
       context_->cors_origin_access_list(), std::move(cookie_observer),
-       std::move(auth_cert_observer), std::move(devtools_observer));
+       std::move(url_loader_network_observer), std::move(devtools_observer));
 diff --git a/services/network/url_loader_factory.h b/services/network/url_loader_factory.h
-index 36978ccde84b7575c11035e9efb352b057e3cd1a..f68889501d243cc21b0e58567b63fbc02dd747e8 100644
+index f0e423b245026a06161ab922c1aed44c9152e40a..ebce1dae5a0bceeff8e77595d4cb57166c1d236f 100644
 --- a/services/network/url_loader_factory.h
 +++ b/services/network/url_loader_factory.h
-@@ -76,6 +76,7 @@ class URLLoaderFactory : public mojom::URLLoaderFactory {
+@@ -79,6 +79,7 @@ class URLLoaderFactory : public mojom::URLLoaderFactory {
   scoped_refptr<ResourceSchedulerClient> resource_scheduler_client_;
   mojo::Remote<mojom::TrustedURLLoaderHeaderClient> header_client_;
   mojo::Remote<mojom::CrossOriginEmbedderPolicyReporter> coep_reporter_;
--- a/patches/chromium/allow_in_process_windows_to_have_different_web_prefs.patch
+++ b/patches/chromium/allow_in_process_windows_to_have_different_web_prefs.patch
@ -86,7 +86,7 @@ index ba1ba323ec45296c33b5931652a001d6bd24dbe0..663d47894592499531ff924c78b51832
   out->accelerated_video_decode_enabled =
       data.accelerated_video_decode_enabled();
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
-index ab727750abcb0253463e83c984bf1afd9e296021..cd4598e022b144c728990b47957baa031097dfc9 100644
+index e1fb30cfba2656989141f0a53ec3e6202c9b0409..ff9da0f6e66ed6565a64c33cc60f39510075c1f4 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences.h
@@ -9,6 +9,7 @@
@ -128,7 +128,7 @@ index ab727750abcb0253463e83c984bf1afd9e296021..cd4598e022b144c728990b47957baa03
   // only controls whether or not the "document.cookie" field is properly
   // connected to the backing store, for instance if you wanted to be able to
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
-index 68d33ca3be294fc79f6d5d1a6ae6a8dfd427f4b1..9663462132151638ad480f8431a0ea428c6f0563 100644
+index ae180b30284c17c7319925531440161f66b873c7..2857c7fdcb18b6f9d858c038ee2a9784c141766b 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
@@ -6,6 +6,7 @@
--- a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch
+++ b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch
@ -6,81 +6,81 @@ Subject: Allow setting secondary label via SimpleMenuModel
 Builds on https://chromium-review.googlesource.com/c/chromium/src/+/2208976

 diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc
-index 7db4ef95402087b875be983f230f3e73e1e8af59..129c5b06f7a40a49ff566759b6da0911aac3d044 100644
+index 016dab7776139c8ea7eab60569f3e5c5aeff8014..022225c4c02300667c58dc61165cc19d68eb4ca7 100644
 --- a/ui/base/models/simple_menu_model.cc
 +++ b/ui/base/models/simple_menu_model.cc
-@@ -53,6 +53,11 @@ base::string16 SimpleMenuModel::Delegate::GetLabelForCommandId(
-   return base::string16();
+@@ -53,6 +53,11 @@ std::u16string SimpleMenuModel::Delegate::GetLabelForCommandId(
+   return std::u16string();
 }
 
-+base::string16 SimpleMenuModel::Delegate::GetSecondaryLabelForCommandId(
+std::u16string SimpleMenuModel::Delegate::GetSecondaryLabelForCommandId(
 +    int command_id) const {
-+  return base::string16();
+  return std::u16string();
 +}
 +
 ImageModel SimpleMenuModel::Delegate::GetIconForCommandId(
     int command_id) const {
   return ImageModel();
-@@ -295,6 +300,11 @@ void SimpleMenuModel::SetLabel(int index, const base::string16& label) {
+@@ -295,6 +300,11 @@ void SimpleMenuModel::SetLabel(int index, const std::u16string& label) {
   MenuItemsChanged();
 }
 
-+void SimpleMenuModel::SetSecondaryLabel(int index, const base::string16& secondary_label) {
+void SimpleMenuModel::SetSecondaryLabel(int index, const std::u16string& secondary_label) {
 +  items_[ValidateItemIndex(index)].secondary_label = secondary_label;
 +  MenuItemsChanged();
 +}
 +
 void SimpleMenuModel::SetMinorText(int index,
-                                    const base::string16& minor_text) {
+                                    const std::u16string& minor_text) {
   items_[ValidateItemIndex(index)].minor_text = minor_text;
-@@ -377,6 +387,12 @@ base::string16 SimpleMenuModel::GetLabelAt(int index) const {
+@@ -377,6 +387,12 @@ std::u16string SimpleMenuModel::GetLabelAt(int index) const {
   return items_[ValidateItemIndex(index)].label;
 }
 
-+base::string16 SimpleMenuModel::GetSecondaryLabelAt(int index) const {
+std::u16string SimpleMenuModel::GetSecondaryLabelAt(int index) const {
 +  if (IsItemDynamicAt(index))
 +    return delegate_->GetSecondaryLabelForCommandId(GetCommandIdAt(index));
 +  return items_[ValidateItemIndex(index)].secondary_label;
 +}
 +
- base::string16 SimpleMenuModel::GetMinorTextAt(int index) const {
+ std::u16string SimpleMenuModel::GetMinorTextAt(int index) const {
   return items_[ValidateItemIndex(index)].minor_text;
 }
 diff --git a/ui/base/models/simple_menu_model.h b/ui/base/models/simple_menu_model.h
-index 7cefe1d152ef6df95bc431cb1d35147210b614b9..db13baf0000f917dc63aadd42d5168cdac9fb020 100644
+index 7dc52c90a032ae21db1e453f1f901c49131a11ca..f5df563276d97f4e0b4b20100e7b2474acaea461 100644
 --- a/ui/base/models/simple_menu_model.h
 +++ b/ui/base/models/simple_menu_model.h
@@ -51,6 +51,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
     // Some command ids have labels and icons that change over time.
     virtual bool IsItemForCommandIdDynamic(int command_id) const;
-     virtual base::string16 GetLabelForCommandId(int command_id) const;
-+    virtual base::string16 GetSecondaryLabelForCommandId(int command_id) const;
+     virtual std::u16string GetLabelForCommandId(int command_id) const;
+    virtual std::u16string GetSecondaryLabelForCommandId(int command_id) const;
     // Gets the icon for the item with the specified id.
     virtual ImageModel GetIconForCommandId(int command_id) const;
 
@@ -154,6 +155,9 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
   // Sets the label for the item at |index|.
-   void SetLabel(int index, const base::string16& label);
+   void SetLabel(int index, const std::u16string& label);
 
 +  // Sets the secondary_label for the item at |index|.
-+  void SetSecondaryLabel(int index, const base::string16& secondary_label);
+  void SetSecondaryLabel(int index, const std::u16string& secondary_label);
 +
   // Sets the minor text for the item at |index|.
-   void SetMinorText(int index, const base::string16& minor_text);
+   void SetMinorText(int index, const std::u16string& minor_text);
 
@@ -186,6 +190,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
   ui::MenuSeparatorType GetSeparatorTypeAt(int index) const override;
   int GetCommandIdAt(int index) const override;
-   base::string16 GetLabelAt(int index) const override;
-+  base::string16 GetSecondaryLabelAt(int index) const override;
-   base::string16 GetMinorTextAt(int index) const override;
+   std::u16string GetLabelAt(int index) const override;
+  std::u16string GetSecondaryLabelAt(int index) const override;
+   std::u16string GetMinorTextAt(int index) const override;
   ImageModel GetMinorIconAt(int index) const override;
   bool IsItemDynamicAt(int index) const override;
@@ -223,6 +228,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
     int command_id = 0;
     ItemType type = TYPE_COMMAND;
-     base::string16 label;
-+    base::string16 secondary_label;
-     base::string16 minor_text;
+     std::u16string label;
+    std::u16string secondary_label;
+     std::u16string minor_text;
     ImageModel minor_icon;
     ImageModel icon;
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@ -15,10 +15,10 @@ Refs changes in:
 This patch reverts the changes to fix associated crashes in Electron.

 diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
-index cc24d583ac920c5d7f0d667b0890fd323c58280a..ae12f5f18eccacf0377511aa8f1f99123168a6a5 100644
+index f06a116b6a5b963308c1fd099bcbad5a72c2bce0..f2a2bfbdedfac3ba0c2100a447c22c56e5d88fbb 100644
 --- a/third_party/blink/renderer/core/frame/frame.cc
 +++ b/third_party/blink/renderer/core/frame/frame.cc
-@@ -117,14 +117,6 @@ bool Frame::Detach(FrameDetachType type) {
+@@ -118,14 +118,6 @@ bool Frame::Detach(FrameDetachType type) {
 
   DCHECK(!IsDetached());
 
@ -33,7 +33,7 @@ index cc24d583ac920c5d7f0d667b0890fd323c58280a..ae12f5f18eccacf0377511aa8f1f9912
   if (type == FrameDetachType::kRemove) {
     if (provisional_frame_) {
       provisional_frame_->Detach(FrameDetachType::kRemove);
-@@ -147,6 +139,14 @@ bool Frame::Detach(FrameDetachType type) {
+@@ -148,6 +140,14 @@ bool Frame::Detach(FrameDetachType type) {
     GetWindowProxyManager()->ClearForSwap();
   }
 
@ -49,10 +49,10 @@ index cc24d583ac920c5d7f0d667b0890fd323c58280a..ae12f5f18eccacf0377511aa8f1f9912
   // its owning reference back to our owning LocalFrame.
   client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index e1353cf55aa63b6ec6bd5470b92269193313a6a7..867e66291ce43cd744269c68f4f7ee90c054c8a3 100644
+index 0d0e15a70e33fe2579a9c15bc52f28c918e8c4de..1a02ba1623cbdcf9853985512302a211589da198 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -671,10 +671,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -672,10 +672,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
   }
   DCHECK(!view_ || !view_->IsAttached());
 
@ -63,7 +63,7 @@ index e1353cf55aa63b6ec6bd5470b92269193313a6a7..867e66291ce43cd744269c68f4f7ee90
   if (!Client())
     return false;
 
-@@ -716,6 +712,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -717,6 +713,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
   DCHECK(!view_->IsAttached());
   Client()->WillBeDetached();
 
--- a/patches/chromium/blink_world_context.patch
+++ b/patches/chromium/blink_world_context.patch
@ -7,7 +7,7 @@ This exposes a method for obtaining a reference to an isolated world, which is
 otherwise not available in the Blink API.

 diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
-index 9484e7c7944b0f0602d4f230854e45ed716fb884..96325d07de4690ab5ee03c538fd6dccc0cf3de96 100644
+index 315c95a0ba24ea675d82f1d1b1840683c012de82..01709c0c3ed79dad8cacb1c7075d4dfba8dc6d84 100644
 --- a/third_party/blink/public/web/web_local_frame.h
 +++ b/third_party/blink/public/web/web_local_frame.h
@@ -368,6 +368,8 @@ class WebLocalFrame : public WebFrame {
@ -20,10 +20,10 @@ index 9484e7c7944b0f0602d4f230854e45ed716fb884..96325d07de4690ab5ee03c538fd6dccc
   // Executes script in the context of the current page and returns the value
   // that the script evaluated to with callback. Script execution can be
 diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
-index 0a880c510a1901d2c59226df0fa807f55ed2edc0..2fbbe5d1bb7d515dad97b8805448729fe00d4ed1 100644
+index 1b180b94b247d7f39f61596a5a86ce38f595362a..99258a29d82ea0e37b226c8d6e2f3a810e615883 100644
 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
 +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
-@@ -1036,6 +1036,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
+@@ -1037,6 +1037,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
   return MainWorldScriptContext()->Global();
 }
 
@ -38,7 +38,7 @@ index 0a880c510a1901d2c59226df0fa807f55ed2edc0..2fbbe5d1bb7d515dad97b8805448729f
   return BindingSecurity::ShouldAllowAccessToFrame(
       CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
 diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
-index c0119afcd891087844f6d4d42b0c7d071278d52b..f39db84eea9ae29c039f578cfde7cea201433e23 100644
+index 44d642f4cf94000e42241ff5dafdabf4ed8fbafb..1000a606f1e5a7dea2705e0d35c9cfef8e48abfb 100644
 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
 +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
@@ -166,6 +166,8 @@ class CORE_EXPORT WebLocalFrameImpl final
--- a/patches/chromium/build_gn.patch
+++ b/patches/chromium/build_gn.patch
@ -14,7 +14,7 @@ tradeoff is that switching from MAS_BUILD to !MAS_BUILD or vice-versa will
 rebuild the entire tree.

 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
-index fa375deef6c851867efdd8e9d6a79261b1256774..e170c988f01fb62c0193456c8e65378fad87e7b0 100644
+index 4bedf1ef1b3c642ff2839d0ad62caaedd1e1254f..ef5c81761df66c41fb8db575434280c4866d4f4a 100644
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
@@ -123,6 +123,9 @@ if (current_os == "") {
@ -27,7 +27,7 @@ index fa375deef6c851867efdd8e9d6a79261b1256774..e170c988f01fb62c0193456c8e65378f
   # Set to enable the official build level of optimization. This has nothing
   # to do with branding, but enables an additional level of optimization above
   # release (!is_debug). This might be better expressed as a tri-state
-@@ -334,6 +337,7 @@ default_compiler_configs = [
+@@ -336,6 +339,7 @@ default_compiler_configs = [
   "//build/config/compiler/pgo:default_pgo_flags",
   "//build/config/coverage:default_coverage",
   "//build/config/sanitizers:default_sanitizer_flags",
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.

 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 7d498c0568cddd3a91ab5b6ee84676e50bf0ef1a..2f8111fda3400b01b29c09d6f3d256aac1e69020 100644
+index f2d027d32e3cff2d1f0f03ed6c47ee689524ca1d..82dac3411b63e541d92b486f5e2108cce881b48e 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -5287,6 +5287,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -5312,6 +5312,7 @@ void RenderFrameHostImpl::CreateNewWindow(
           last_committed_origin_, params->window_container_type,
           params->target_url, params->referrer.To<Referrer>(),
           params->frame_name, params->disposition, *params->features,
@ -21,10 +21,10 @@ index 7d498c0568cddd3a91ab5b6ee84676e50bf0ef1a..2f8111fda3400b01b29c09d6f3d256aa
           &no_javascript_access);
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index fe4a5571e3ffd587dd8b566f07be41953e220a0a..c36d614a237077e5dedb4450ec51316b0fd2a990 100644
+index dfb04614aa0244934798870317f500751869b7ea..703f847c844fda3b9efbbd7ce28743c5a9d991a4 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3619,6 +3619,14 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
+@@ -3637,6 +3637,14 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
   }
   auto* new_contents_impl = new_contents.get();
 
@ -39,7 +39,7 @@ index fe4a5571e3ffd587dd8b566f07be41953e220a0a..c36d614a237077e5dedb4450ec51316b
   new_contents_impl->GetController().SetSessionStorageNamespace(
       partition_id, session_storage_namespace);
 
-@@ -3661,12 +3669,6 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
+@@ -3679,12 +3687,6 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
     AddWebContentsDestructionObserver(new_contents_impl);
   }
 
@ -53,10 +53,10 @@ index fe4a5571e3ffd587dd8b566f07be41953e220a0a..c36d614a237077e5dedb4450ec51316b
                              new_contents_impl, opener, params.target_url,
                              params.referrer.To<Referrer>(), params.disposition,
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index 92e4ff63cb65e06a3d6dc8af521691aed7119bfd..23b5a2266433182c494bdd1cf3c0aed01a1d6fa2 100644
+index 7f26f6ed0861bc5a351123feddddd10b479409f3..bfd5c4aca4b3c23ee092788eb97bf5dfe00ad944 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
-@@ -529,6 +529,10 @@ struct CreateNewWindowParams {
+@@ -528,6 +528,10 @@ struct CreateNewWindowParams {
   // The impression associated with the navigation in the new window, if
   // one is specified.
   Impression? impression;
@ -68,10 +68,10 @@ index 92e4ff63cb65e06a3d6dc8af521691aed7119bfd..23b5a2266433182c494bdd1cf3c0aed0
 
 // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index c8926e0e832d2edabbfda9416ec95bc701776387..523084f820e841bbf8b8fa3974f94a4e938db81b 100644
+index 4516cea37427a933e961e1e646dfa1b685b6acc1..8d899d675d0eca0856269e9887371a6f633ef767 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -562,6 +562,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -552,6 +552,8 @@ bool ContentBrowserClient::CanCreateWindow(
     const std::string& frame_name,
     WindowOpenDisposition disposition,
     const blink::mojom::WindowFeatures& features,
@ -81,7 +81,7 @@ index c8926e0e832d2edabbfda9416ec95bc701776387..523084f820e841bbf8b8fa3974f94a4e
     bool opener_suppressed,
     bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 3aed911c525b7e100fae096994212c3e7d4ee308..b1c4ad7a48f760d2ba7908c9611b5f894af575d6 100644
+index fedf85bfac89c9372b0fd48e908b1c73da92c0ee..52a300a553742469ad7eea7ccb85e5e9988363b7 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
@@ -158,6 +158,7 @@ class NetworkService;
@ -92,7 +92,7 @@ index 3aed911c525b7e100fae096994212c3e7d4ee308..b1c4ad7a48f760d2ba7908c9611b5f89
 }  // namespace network
 
 namespace sandbox {
-@@ -916,6 +917,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -910,6 +911,8 @@ class CONTENT_EXPORT ContentBrowserClient {
       const std::string& frame_name,
       WindowOpenDisposition disposition,
       const blink::mojom::WindowFeatures& features,
@ -102,7 +102,7 @@ index 3aed911c525b7e100fae096994212c3e7d4ee308..b1c4ad7a48f760d2ba7908c9611b5f89
       bool opener_suppressed,
       bool* no_javascript_access);
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index 22de0f5ed42f6fd641220e7bc5f20a1c60e107fc..15226ca43d1e1f0e5b89eaecd2029f7be8e802fa 100644
+index ba416aebd7936d5cf7f890d071acf503765b47f6..412fa31a6fb853eb757e19e64efb0829753faed9 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
@@ -27,6 +27,17 @@ namespace content {
@ -124,7 +124,7 @@ index 22de0f5ed42f6fd641220e7bc5f20a1c60e107fc..15226ca43d1e1f0e5b89eaecd2029f7b
                                                  const OpenURLParams& params) {
   return nullptr;
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index e752b5bd6893bc991f9c5628d4b46a6f616ceb5e..d33903b54130cc9deffce09472e9ac2d8329d82d 100644
+index 164d5d1d4d401ba2ff9a6d233d11d43346526f2e..dd7968c1eacc79eadd9b068e0cfb10a03c6ac311 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
@@ -17,6 +17,7 @@
@ -135,8 +135,8 @@ index e752b5bd6893bc991f9c5628d4b46a6f616ceb5e..d33903b54130cc9deffce09472e9ac2d
 #include "content/public/browser/eye_dropper.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/media_stream_request.h"
-@@ -337,6 +338,13 @@ class CONTENT_EXPORT WebContentsDelegate {
-       const std::string& partition_id,
+@@ -341,6 +342,13 @@ class CONTENT_EXPORT WebContentsDelegate {
+       const StoragePartitionId& partition_id,
       SessionStorageNamespace* session_storage_namespace);
 
 +  virtual void WebContentsCreatedWithFullParams(
@ -150,7 +150,7 @@ index e752b5bd6893bc991f9c5628d4b46a6f616ceb5e..d33903b54130cc9deffce09472e9ac2d
   // typically happens when popups are created.
   virtual void WebContentsCreated(WebContents* source_contents,
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index bcc333b8d17ec931db3585407d4cf8b15bf7c236..605f15acc3b6221870e6bb9467d182127f82fe84 100644
+index 43924d90b41a349bc496d6ca940c1c9963d2773c..2840883471055f0b09ecbc18d301e1b5de8b3d5a 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
@@ -28,6 +28,7 @@
@ -221,10 +221,10 @@ index 4f735ad0d97eaac9a57dad137e479f8a7ec33a36..0a3c5821962c85609b64b3625fa6b8d6
 
 }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index 664fd015bc9e7f36078e131c036b88074d4756a0..cfd8e88a8bb6311002f45ba2b1ce40fa56301e26 100644
+index e4f5968c7917f932a52f23efb08c3bfd7aec6d2f..7fb0c57f3e6a6668acb99e47cf46b22d2cbe0f3a 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2027,6 +2027,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
+@@ -2015,6 +2015,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
   }
 
   WebWindowFeatures window_features = GetWindowFeaturesFromString(features);
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@ -35,7 +35,7 @@ index 5b4d70991e19edcdfee731c56251932bf43e535f..fe1977c5e6ce0f5b30e8be529b9efa51
 
 #endif  // CHROME_BROWSER_ANDROID_DOCUMENT_DOCUMENT_WEB_CONTENTS_DELEGATE_H_
 diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
-index 362b3d7486198109626344e46d29e4446bd00d44..442281b1c7b7f45ffaaa245232975e07fc1edfd9 100644
+index 8642c20123ec62fd6c90c8945d78bc3e04116c5b..f33ad843cc4b602c0e3312be426b81a0332afe66 100644
 --- a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
 +++ b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
@@ -123,8 +123,7 @@ class DriveWebContentsManager : public content::WebContentsObserver,
@ -140,10 +140,10 @@ index 33f1168f834d138aefb190b7718271d6962b3532..aeb30a22349e0682586bd1bad20dc5e2
   }
 
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index 2f2862c426124556e1109dd243475d8514c814d8..7456a84ea0cf7be69ac8f84140f11c68a429ed6f 100644
+index 19ca9ee265876d2d33ced262be84cda1d056372c..b41c489a683995c3aa582d7eccbabe679b5cbb46 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -1762,12 +1762,11 @@ bool Browser::IsWebContentsCreationOverridden(
+@@ -1769,12 +1769,11 @@ bool Browser::IsWebContentsCreationOverridden(
     content::SiteInstance* source_site_instance,
     content::mojom::WindowContainerType window_container_type,
     const GURL& opener_url,
@ -159,10 +159,10 @@ index 2f2862c426124556e1109dd243475d8514c814d8..7456a84ea0cf7be69ac8f84140f11c68
 
 WebContents* Browser::CreateCustomWebContents(
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index 3a0202c2139b3a6d62f10d9ce965e689dc96bf4a..0e45b455daee1e1ddb8ad3ab263d70db3a7b675d 100644
+index 32f9f251d2c3f8c5443f2284d6f70769848df532..a3729cf13b57607dabc6278634f6ff0c2a030097 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
-@@ -797,8 +797,7 @@ class Browser : public TabStripModelObserver,
+@@ -796,8 +796,7 @@ class Browser : public TabStripModelObserver,
       content::SiteInstance* source_site_instance,
       content::mojom::WindowContainerType window_container_type,
       const GURL& opener_url,
@ -201,7 +201,7 @@ index 058ec72442d59989c4d6df4a7c791ecfeff0ef99..f7c8c2139382cb2e290c561624291afe
   // The profile used for the presentation.
   Profile* otr_profile_;
 diff --git a/components/embedder_support/android/delegate/web_contents_delegate_android.cc b/components/embedder_support/android/delegate/web_contents_delegate_android.cc
-index e8cee3297c218cd86b1200003e574c3713ab7afe..48216c9fccf1452f869fcfb24ba5206798c4c4e6 100644
+index bf69ad20f61b6928b1a65edef324577dcc6af689..82050776a23fa7b6af4b27bd28325c10f75c5fb7 100644
 --- a/components/embedder_support/android/delegate/web_contents_delegate_android.cc
 +++ b/components/embedder_support/android/delegate/web_contents_delegate_android.cc
@@ -168,14 +168,13 @@ bool WebContentsDelegateAndroid::IsWebContentsCreationOverridden(
@ -222,7 +222,7 @@ index e8cee3297c218cd86b1200003e574c3713ab7afe..48216c9fccf1452f869fcfb24ba52067
                                                                   java_gurl);
 }
 diff --git a/components/embedder_support/android/delegate/web_contents_delegate_android.h b/components/embedder_support/android/delegate/web_contents_delegate_android.h
-index 348c65a323c6104030f50e1336ccbd9ada9e7628..c7d6a0041de46784bb28146d5ffd53ded3e5685d 100644
+index cf50204a6aeb099d25dc41d4180f8a1e32a63eda..642e88a4de3044173423fae5bfe2e30ef442f366 100644
 --- a/components/embedder_support/android/delegate/web_contents_delegate_android.h
 +++ b/components/embedder_support/android/delegate/web_contents_delegate_android.h
@@ -78,8 +78,7 @@ class WebContentsDelegateAndroid : public content::WebContentsDelegate {
@ -264,10 +264,10 @@ index c5c5a7b63b5b3b62a9517cbef3ae23ce57a3c89c..4f1b7e88d6d2ae89a60311c8aeb1fcee
   void AddNewContents(content::WebContents* source,
                       std::unique_ptr<content::WebContents> new_contents,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 6a044db477fc5b20e3ab6e14fda3c21162d112cb..f3884caf2320fb17bed8d84f342b5f8cc3b0b4c1 100644
+index cd90a347277d1375251e4e4b9025ca1726010324..53f48964e6dfd0fb9b91762760b59a006ac7cc0c 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3571,8 +3571,7 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
+@@ -3589,8 +3589,7 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
 
   if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                        source_site_instance, params.window_container_type,
@ -278,7 +278,7 @@ index 6a044db477fc5b20e3ab6e14fda3c21162d112cb..f3884caf2320fb17bed8d84f342b5f8c
         opener, source_site_instance, is_new_browsing_instance,
         opener->GetLastCommittedURL(), params.frame_name, params.target_url,
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index 15226ca43d1e1f0e5b89eaecd2029f7be8e802fa..5565c3238ce555e3702b27697babed74394e4d0a 100644
+index 412fa31a6fb853eb757e19e64efb0829753faed9..1378593a48932b8272bafbe70c4797befdc32f02 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
@@ -135,8 +135,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden(
@ -292,10 +292,10 @@ index 15226ca43d1e1f0e5b89eaecd2029f7be8e802fa..5565c3238ce555e3702b27697babed74
 }
 
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index d33903b54130cc9deffce09472e9ac2d8329d82d..dbbf35be27c5e14acca88bcb22598962966375f0 100644
+index dd7968c1eacc79eadd9b068e0cfb10a03c6ac311..6ce899d5eab1d643d71e33a85653f8802122614c 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
-@@ -316,8 +316,7 @@ class CONTENT_EXPORT WebContentsDelegate {
+@@ -320,8 +320,7 @@ class CONTENT_EXPORT WebContentsDelegate {
       SiteInstance* source_site_instance,
       content::mojom::WindowContainerType window_container_type,
       const GURL& opener_url,
@ -306,7 +306,7 @@ index d33903b54130cc9deffce09472e9ac2d8329d82d..dbbf35be27c5e14acca88bcb22598962
   // Allow delegate to creates a custom WebContents when
   // WebContents::CreateNewWindow() is called. This function is only called
 diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.cc b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
-index bda659c7a464a58413e7eb33a897065268ab3fc6..29950878aca7f1518265561dea79b78d82230982 100644
+index 5f49edfabed15d691dc6cc7b17896165297735a7..d64baa43afcf5a0f87797995b84b60d84e1f05a2 100644
 --- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc
 +++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
@@ -212,8 +212,7 @@ bool ExtensionOptionsGuest::IsWebContentsCreationOverridden(
@ -320,7 +320,7 @@ index bda659c7a464a58413e7eb33a897065268ab3fc6..29950878aca7f1518265561dea79b78d
   // view is used for displaying embedded extension options, we want any
   // external links to be opened in a new tab, not in a new guest view so we
 diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.h b/extensions/browser/guest_view/extension_options/extension_options_guest.h
-index 97273c32a05acf325fd0de22c4f79c1746aa23bc..4b357acd069387963347d35d82371b955147893f 100644
+index 9b293d0df6c634bf44a69d607c4eee839a74b4a1..7e5b9cbdcc232c5e20eae0130d800f508411b827 100644
 --- a/extensions/browser/guest_view/extension_options/extension_options_guest.h
 +++ b/extensions/browser/guest_view/extension_options/extension_options_guest.h
@@ -55,8 +55,7 @@ class ExtensionOptionsGuest
@ -334,10 +334,10 @@ index 97273c32a05acf325fd0de22c4f79c1746aa23bc..4b357acd069387963347d35d82371b95
       content::RenderFrameHost* opener,
       content::SiteInstance* source_site_instance,
 diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
-index e910810ff0de768dba372cbe43c8ee851d5b430b..59813e3162e41db0a7e6e5519a7b42d2f50e4bec 100644
+index f3b8095088310c0811d33904bc400a4ff8c60323..c5398f93dedef93b71e64af3a2d9f2c011245b8d 100644
 --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
-@@ -382,8 +382,7 @@ bool MimeHandlerViewGuest::IsWebContentsCreationOverridden(
+@@ -379,8 +379,7 @@ bool MimeHandlerViewGuest::IsWebContentsCreationOverridden(
     content::SiteInstance* source_site_instance,
     content::mojom::WindowContainerType window_container_type,
     const GURL& opener_url,
@ -348,7 +348,7 @@ index e910810ff0de768dba372cbe43c8ee851d5b430b..59813e3162e41db0a7e6e5519a7b42d2
 }
 
 diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
-index bdba06b3d493a3ecf6d96ebabc336179b35feada..44e8c6e0e31831c29f8463ded1b640ec6c86b3da 100644
+index 17f911eef902bd5f30c852c1f517f4c1dd22c5b0..be333612ef35a8f43e66f3ca181bd573dd40791b 100644
 --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
 +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
@@ -157,8 +157,7 @@ class MimeHandlerViewGuest
@ -362,7 +362,7 @@ index bdba06b3d493a3ecf6d96ebabc336179b35feada..44e8c6e0e31831c29f8463ded1b640ec
       content::RenderFrameHost* opener,
       content::SiteInstance* source_site_instance,
 diff --git a/fuchsia/engine/browser/frame_impl.cc b/fuchsia/engine/browser/frame_impl.cc
-index 781cdcb53ae6bb60f807d3a80293739568ce8f71..a8305998edac476bec47b531be7aa20db1982df2 100644
+index f50f4343ed5a487538ef9ce819cd19300623a3dd..282bca34f82e5a3b27bc66f0cab494e388f35b9e 100644
 --- a/fuchsia/engine/browser/frame_impl.cc
 +++ b/fuchsia/engine/browser/frame_impl.cc
@@ -372,8 +372,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
@ -376,7 +376,7 @@ index 781cdcb53ae6bb60f807d3a80293739568ce8f71..a8305998edac476bec47b531be7aa20d
   // can catch bad client behavior while not interfering with normal operation.
   constexpr size_t kMaxPendingWebContentsCount = 10;
 diff --git a/fuchsia/engine/browser/frame_impl.h b/fuchsia/engine/browser/frame_impl.h
-index 9bdcbcc9fedf490c93d4765f2ff0e9d664245038..be92c446edec096921e4c61053d8f9f9321c0e78 100644
+index 429c3b508ea698dc286676a84b6a3817eb14b553..03a610610cbb120e4a9c367bbb074050365cc04f 100644
 --- a/fuchsia/engine/browser/frame_impl.h
 +++ b/fuchsia/engine/browser/frame_impl.h
@@ -234,8 +234,7 @@ class FrameImpl : public fuchsia::web::Frame,
@ -404,7 +404,7 @@ index 4fdbf1c7030bb2b3765780d1e8c5a502679745de..5b59ce27eaa03897e5cbb3115b485a3e
         ->options()
         ->block_new_web_contents();
 diff --git a/ui/views/controls/webview/web_dialog_view.cc b/ui/views/controls/webview/web_dialog_view.cc
-index d5730f111981ca06835aeec44389920d1d000786..904f4a215cc3e5f7ac0037e05b79a0f4501f951e 100644
+index 2315e34e4c9cb60fee248c71e44984f68f1462d3..49a165ac686f611d8a982bf0b5481504e824b5a6 100644
 --- a/ui/views/controls/webview/web_dialog_view.cc
 +++ b/ui/views/controls/webview/web_dialog_view.cc
@@ -431,8 +431,7 @@ bool WebDialogView::IsWebContentsCreationOverridden(
@ -418,7 +418,7 @@ index d5730f111981ca06835aeec44389920d1d000786..904f4a215cc3e5f7ac0037e05b79a0f4
     return delegate_->HandleShouldOverrideWebContentsCreation();
   return false;
 diff --git a/ui/views/controls/webview/web_dialog_view.h b/ui/views/controls/webview/web_dialog_view.h
-index d4cb57f0f043d48906d75a46873de6bb0108266e..19bb92a54134d18c695c9fa6a090f1be4c9469dd 100644
+index dadead3378af8b756b37b4efc58bee0aa121751f..62ac39757774de85e3ab2ec62c929e70993ebcf2 100644
 --- a/ui/views/controls/webview/web_dialog_view.h
 +++ b/ui/views/controls/webview/web_dialog_view.h
@@ -160,8 +160,7 @@ class WEBVIEW_EXPORT WebDialogView : public ClientView,
--- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
+++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources.  We need to load these from
 Electrons grit header instead of Chromes

 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index b46c00260b5e9431f6465c8ff8cdddff217ab517..a7f1c10650505e16d89d60a409372b98096544bb 100644
+index 8eebf372cfe6c17d5a7c807e557e085f8d569f19..bcab35896cfee95fa982e7f48a977addb62b02ec 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -6234,6 +6234,7 @@ static_library("browser") {
+@@ -6233,6 +6233,7 @@ static_library("browser") {
     deps += [
       "//components/spellcheck/browser",
       "//components/spellcheck/common",
@ -44,7 +44,7 @@ index 41761e18716a7d9221511978dc4582a1804920e2..faea3d936c678e31fa29b93ae1ccd976
   ]
 }
 diff --git a/components/language/core/browser/language_prefs.cc b/components/language/core/browser/language_prefs.cc
-index c14811efa87b223729d37695d86f858dd8f366ee..444c8273e4985f7e276ad0dd0fd001b027bc0d47 100644
+index fc220d8c9f297268e7e480bb518d2de0d3dd9e4f..18e27d61fab8919969756129de1f61f55790cc88 100644
 --- a/components/language/core/browser/language_prefs.cc
 +++ b/components/language/core/browser/language_prefs.cc
@@ -21,7 +21,7 @@
--- a/patches/chromium/content_browser_main_loop.patch
+++ b/patches/chromium/content_browser_main_loop.patch
@ -8,10 +8,10 @@ run before shutdown. This is required to cleanup WebContents asynchronously
 in electron::api::WebContents::ResetManagedWebContents.

 diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
-index 37b9556adceca54bfe80328232c8add16381e9c8..ed60f417f3a0704ac9b42a92f3f8493f0d314149 100644
+index 72693b82f5c4bcd0b5151e97820ec2de9662670c..dba51b8cdd420f8fecc45dff2a92a3110435c737 100644
 --- a/content/browser/browser_main_loop.cc
 +++ b/content/browser/browser_main_loop.cc
-@@ -1405,7 +1405,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
+@@ -1413,7 +1413,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
   NOTREACHED();
 #else
   base::RunLoop run_loop;
--- a/patches/chromium/dcheck.patch
+++ b/patches/chromium/dcheck.patch
@ -17,10 +17,10 @@ only one or two specific checks fail. Then it's better to simply comment out the
 failing checks and allow the rest of the target to have them enabled.

 diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc
-index 7cd8a4d740413a9d1d4687a7a05e98d432ba58c0..335d5b6f9a296f793a8b5e6ca08b3585d28582fe 100644
+index 21601429c56fc374da8826cb68361ff0de56ac55..9b27a4ff1abac2b104f0ac16c9ed2e3518279d84 100644
 --- a/content/browser/renderer_host/navigation_controller_impl.cc
 +++ b/content/browser/renderer_host/navigation_controller_impl.cc
-@@ -1326,8 +1326,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
+@@ -1336,8 +1336,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
     return NAVIGATION_TYPE_NEW_SUBFRAME;
   }
 
@ -33,7 +33,7 @@ index 7cd8a4d740413a9d1d4687a7a05e98d432ba58c0..335d5b6f9a296f793a8b5e6ca08b3585
 
   if (rfh->GetParent()) {
     // All manual subframes would be did_create_new_entry and handled above, so
-@@ -1618,7 +1620,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewEntry(
+@@ -1629,7 +1631,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewEntry(
     new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon();
   }
 
@ -46,7 +46,7 @@ index 7cd8a4d740413a9d1d4687a7a05e98d432ba58c0..335d5b6f9a296f793a8b5e6ca08b3585
   // navigation. Now we know that the renderer has updated its state accordingly
   // and it is safe to also clear the browser side history.
 diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
-index 84071dbb29c4394d9199132c403a416745a9adfa..10e895128ba8f32768e3aa5a2386fc91a02a8771 100644
+index 0763e37f028a708c6e739458ec4c87c406e79b46..2d238fde0a1eb3f22fd52cbad3b12d704af2e8ae 100644
 --- a/ui/base/clipboard/clipboard_win.cc
 +++ b/ui/base/clipboard/clipboard_win.cc
@@ -924,10 +924,10 @@ SkBitmap ClipboardWin::ReadImageInternal(ClipboardBuffer buffer) const {
--- a/patches/chromium/delay_lock_the_protocol_scheme_registry.patch
+++ b/patches/chromium/delay_lock_the_protocol_scheme_registry.patch
@ -19,10 +19,10 @@ https://chromium-review.googlesource.com/c/chromium/src/+/1901591, we should try
 re-submitting the patch.

 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index 7873fad0a61ba34a860c1dccd368f1920f5011ee..c4b97ae887f5923c006abdda88aaccd330cfe0ad 100644
+index e49304a95fdb71565f61d8d1eb27de365e450eb9..2cf621a173d9c10a20e802ee44fbaa1d364f67e9 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
-@@ -721,7 +721,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
+@@ -722,7 +722,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
   }
 #endif
 
--- a/patches/chromium/desktop_media_list.patch
+++ b/patches/chromium/desktop_media_list.patch
@ -7,10 +7,10 @@ Subject: desktop_media_list.patch
 * Free the one-time use capturer after thumbnails are fetched

 diff --git a/chrome/browser/media/webrtc/desktop_media_list.h b/chrome/browser/media/webrtc/desktop_media_list.h
-index cf7deb678217727e7fe0deed1663b5174164f040..d947051b1cdb36e20a3d9ed29b2172b83eaedf9d 100644
+index cb383b8d095f3fe82a88d811068d98f09d6c508c..dd05d1928ccfe10deb5f96bbcb35eb63b8a3672c 100644
 --- a/chrome/browser/media/webrtc/desktop_media_list.h
 +++ b/chrome/browser/media/webrtc/desktop_media_list.h
-@@ -52,6 +52,9 @@ class DesktopMediaList {
+@@ -53,6 +53,9 @@ class DesktopMediaList {
 
   virtual ~DesktopMediaList() {}
 
@ -20,7 +20,7 @@ index cf7deb678217727e7fe0deed1663b5174164f040..d947051b1cdb36e20a3d9ed29b2172b8
   // Sets time interval between updates. By default list of sources and their
   // thumbnail are updated once per second. If called after StartUpdating() then
   // it will take effect only after the next update.
-@@ -83,6 +86,7 @@ class DesktopMediaList {
+@@ -84,6 +87,7 @@ class DesktopMediaList {
 
   virtual int GetSourceCount() const = 0;
   virtual const Source& GetSource(int index) const = 0;
@ -29,7 +29,7 @@ index cf7deb678217727e7fe0deed1663b5174164f040..d947051b1cdb36e20a3d9ed29b2172b8
   virtual Type GetMediaListType() const = 0;
 };
 diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.cc b/chrome/browser/media/webrtc/desktop_media_list_base.cc
-index bce801e2538ec1391e067822f7fda1248cd7c516..4efcf50745b27e66c8f544072993c9bd4490782e 100644
+index a3e1de40e843b5450f417a0455e0e7d7dee1d1bd..2f7f96a5d56d503fc231ca3c96be243cf7cbb389 100644
 --- a/chrome/browser/media/webrtc/desktop_media_list_base.cc
 +++ b/chrome/browser/media/webrtc/desktop_media_list_base.cc
@@ -24,6 +24,11 @@ DesktopMediaListBase::DesktopMediaListBase(base::TimeDelta update_period,
@ -79,7 +79,7 @@ index bce801e2538ec1391e067822f7fda1248cd7c516..4efcf50745b27e66c8f544072993c9bd
   SourceSet new_source_set;
   for (size_t i = 0; i < new_sources.size(); ++i) {
 diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.h b/chrome/browser/media/webrtc/desktop_media_list_base.h
-index 0c2b98182a8397d2fb0334ea9619f65222c59467..3340c0060ee7475a8c64de3a1cee9dba24d4a732 100644
+index a1038183d5b44ca760576bff55534b5841e2e9d2..d036a4e630e9ba8311cf7670a53b12ac33fdd2ef 100644
 --- a/chrome/browser/media/webrtc/desktop_media_list_base.h
 +++ b/chrome/browser/media/webrtc/desktop_media_list_base.h
@@ -27,6 +27,7 @@ class DesktopMediaListBase : public DesktopMediaList {
@ -111,10 +111,10 @@ index ad7f766a36b1b6b2a8bc0f96369f1aaadf6681f7..f6c6c14a0937430df62c9b9c1132c591
  protected:
   virtual ~DesktopMediaListObserver() {}
 diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-index 8958de11bc10fc50929a552e9a454b6c143d5713..c2d223f527014ecdcccee78194577a31514fc0c9 100644
+index f0efd4af8b7dde2c13d9e63d64249589f14ac24c..6c8c91f7d9574517da6faebe9c73fe3ed03310e3 100644
 --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
 +++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-@@ -10,14 +10,15 @@
+@@ -10,15 +10,16 @@
 #include "base/hash/hash.h"
 #include "base/message_loop/message_pump_type.h"
 #include "base/single_thread_task_runner.h"
@ -127,11 +127,12 @@ index 8958de11bc10fc50929a552e9a454b6c143d5713..c2d223f527014ecdcccee78194577a31
 -#include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
+ #include "content/public/common/content_features.h"
 +#include "electron/grit/electron_resources.h"
 #include "media/base/video_util.h"
 #include "third_party/libyuv/include/libyuv/scale_argb.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-@@ -259,6 +260,8 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
+@@ -265,6 +266,8 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
       FROM_HERE,
       base::BindOnce(&NativeDesktopMediaList::UpdateNativeThumbnailsFinished,
                      media_list_));
--- a/patches/chromium/disable-redraw-lock.patch
+++ b/patches/chromium/disable-redraw-lock.patch
@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
 can be found at https://github.com/electron/electron/issues/1821

 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 0a3940b751709585b94e356e0beb02cd81f6e871..1013375edabb6e59338bcd9266f04ee09668098e 100644
+index 0cf04f6ee625d5d8b58c68f100a599e51ff65927..e92d9cd727d1347db2d455811cc9d4c731d44676 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
@@ -305,6 +305,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
@ -49,7 +49,7 @@ index 0a3940b751709585b94e356e0beb02cd81f6e871..1013375edabb6e59338bcd9266f04ee0
 // HWNDMessageHandler, gfx::WindowImpl overrides:
 
 diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
-index 042392a659fd6934e84d66cc985d25863e365e34..5e88e780c3da4805eae7870291188e636423042e 100644
+index 3c2cfa7fec2c37fa4a57261e694fb071ab237791..8f7c1b6d383740f3ae825c08c3f929e4fee80ac9 100644
 --- a/ui/views/win/hwnd_message_handler.h
 +++ b/ui/views/win/hwnd_message_handler.h
@@ -202,6 +202,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
--- a/patches/chromium/disable_color_correct_rendering.patch
+++ b/patches/chromium/disable_color_correct_rendering.patch
@ -20,7 +20,7 @@ to deal with color spaces. That is being tracked at
 https://crbug.com/634542 and https://crbug.com/711107.

 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
-index 711f6264fd94139897a074ff421bef73f61e3975..85d1c9a83c5d62f5ca943c1b5f1ec7426eb14763 100644
+index 973eeeb28dfe7260144cd2026aa936dc6a15750c..6d2b701848f0b53ec9701b2a14d67b24ba5763cf 100644
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
@@ -1785,6 +1785,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
@ -229,7 +229,7 @@ index a0fc635ce92491cc3df706e3e52bd8b0cacb2f15..32c497ca0b40517d70639cb16829a628
 +
 +#undef PATCH_CS
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index 80ab092b8480b90210c55a6f630485b7cce51d88..2435a17e914867db1583a24d410b45007043c2a1 100644
+index 25a5780a488191d970b780c1af6712187a5e9cde..2030f3857edfea997a7ff615b3882ec478b9512d 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
@@ -223,6 +223,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@ -241,10 +241,10 @@ index 80ab092b8480b90210c55a6f630485b7cce51d88..2435a17e914867db1583a24d410b4500
     sandbox::policy::switches::kGpuSandboxAllowSysVShm,
     sandbox::policy::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 1b93f610a23c1e1c1ec5a90bfcc9958ec06aad65..8d5f60f36ff4cd92722458049d41836522e90262 100644
+index 24c3f7991246985947e567d90779ecb9416c8686..273b86362eb9eb801ef828f7073ee5c86ca97bd8 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -213,6 +213,7 @@
+@@ -214,6 +214,7 @@
 #include "ui/accessibility/accessibility_switches.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/display/display_switches.h"
@ -252,7 +252,7 @@ index 1b93f610a23c1e1c1ec5a90bfcc9958ec06aad65..8d5f60f36ff4cd92722458049d418365
 #include "ui/gl/gl_switches.h"
 #include "ui/native_theme/native_theme_features.h"
 #include "url/origin.h"
-@@ -3220,6 +3221,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3152,6 +3153,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
   // Propagate the following switches to the renderer command line (along
   // with any associated values) if present in the browser command line.
   static const char* const kSwitchNames[] = {
--- a/patches/chromium/disable_compositor_recycling.patch
+++ b/patches/chromium/disable_compositor_recycling.patch
@ -6,7 +6,7 @@ Subject: fix: disabling compositor recycling
 Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.

 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 7d2426379b8c7b72b735ab936c529596e46dd9d1..c834d63e13136734bf6ad2ada60b3d75ceeb52a0 100644
+index 925b5ab3e666c14f01745f59859ce25f14f64899..8c55c85010940f3ad2135841d9d780779bc2b07d 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -487,7 +487,11 @@
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@ -6,7 +6,7 @@ Subject: disable_hidden.patch
 Electron uses this to disable background throttling for hidden windows.

 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 75d7780ab829ec817d8f956fc1cef3d161849179..c4db072350e60db8323e9d275a28222ac9d18b3e 100644
+index 20c2816765f639ce6ecab16db124f885702064dd..d98336a4b552290aff88a0c14321a58807c7eb05 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -709,6 +709,9 @@ void RenderWidgetHostImpl::WasHidden() {
@ -20,7 +20,7 @@ index 75d7780ab829ec817d8f956fc1cef3d161849179..c4db072350e60db8323e9d275a28222a
       blink::mojom::PointerLockResult::kWrongDocument);
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index 25b10d1d867a7d4052e0daba7b83f62e4e522638..1d7a6bf0994b6529a42b3db505cd28fd33fe579a 100644
+index 36994e352ee697fe445f9b7f20bbb0db0d728cd4..a21adfbc22ed2199520121b8fe36244a735f0653 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -834,6 +834,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
@ -34,7 +34,7 @@ index 25b10d1d867a7d4052e0daba7b83f62e4e522638..1d7a6bf0994b6529a42b3db505cd28fd
   // |routing_id| must not be MSG_ROUTING_NONE.
   // If this object outlives |delegate|, DetachDelegate() must be called when
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index 351e15aeabf320951681646251a04802cda79bde..60263de834e57311ba1e506f6a3eed104a550792 100644
+index 624f7f5aa5314bd810074f354073ff98bb66b3d2..6417bef874d990535a610c78e547ecba57b78369 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -597,7 +597,7 @@ void RenderWidgetHostViewAura::HideImpl() {
--- a/patches/chromium/disable_unload_metrics.patch
+++ b/patches/chromium/disable_unload_metrics.patch
@ -24,10 +24,10 @@ This patch temporarily disables the metrics so we can have green CI, and we
 should continue seeking for a real fix.

 diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
-index 5894c68f14fd3b4a843055e418d8521f526a4c48..bffb4b73103e68632e56d4fd5cc106e2828f84c1 100644
+index c30c380d80c15d3795365be20525ad7a01f3ca4a..8e7aeb43a436ec6be46ffcd7d319a3e2d85462e0 100644
 --- a/content/browser/renderer_host/navigator.cc
 +++ b/content/browser/renderer_host/navigator.cc
-@@ -1025,6 +1025,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1017,6 +1017,7 @@ void Navigator::RecordNavigationMetrics(
             .InMilliseconds());
   }
 
@ -35,7 +35,7 @@ index 5894c68f14fd3b4a843055e418d8521f526a4c48..bffb4b73103e68632e56d4fd5cc106e2
   // If this is a same-process navigation and we have timestamps for unload
   // durations, fill those metrics out as well.
   if (params.unload_start && params.unload_end &&
-@@ -1071,6 +1072,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1063,6 +1064,7 @@ void Navigator::RecordNavigationMetrics(
          first_before_unload_start_time)
             .InMilliseconds());
   }
--- a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
+++ b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
@ -11,10 +11,10 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572
 Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393

 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index d497f3aac9bee9d5738bc50b5650dc2142870e2a..44e234fb8d4332f0f4d5966a141561c283c6626b 100644
+index 43e20435b41c2d682a361ff4f0681081bcf4eab0..b562c8b1f5e588d4a1e471c41e208a18df4482f2 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -2643,7 +2643,7 @@ blink::WebLocalFrame* RenderFrameImpl::GetWebFrame() {
+@@ -2668,7 +2668,7 @@ blink::WebLocalFrame* RenderFrameImpl::GetWebFrame() {
 }
 
 const blink::web_pref::WebPreferences& RenderFrameImpl::GetBlinkPreferences() {
--- a/patches/chromium/enable_reset_aspect_ratio.patch
+++ b/patches/chromium/enable_reset_aspect_ratio.patch
@ -6,7 +6,7 @@ Subject: feat: enable setting aspect ratio to 0
 Make SetAspectRatio accept 0 as valid input, which would reset to null.

 diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index 7476de34aa6ecf7759492e871db82a35bf1a2288..896de263c09b0c0b74f4be472d5d1ce9a3854429 100644
+index 9eb420b6499dcf97a687b833b04c67be28e4074d..081463f6199eb9d9b1205685379d08f60f8ea551 100644
 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -483,7 +483,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
@ -19,7 +19,7 @@ index 7476de34aa6ecf7759492e871db82a35bf1a2288..896de263c09b0c0b74f4be472d5d1ce9
                                    aspect_ratio.height());
 }
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 1013375edabb6e59338bcd9266f04ee09668098e..80b0e1cb9f52c8b25f00d538733c0c15c2df0196 100644
+index e92d9cd727d1347db2d455811cc9d4c731d44676..3dc8185c1fcb19ba20d90e3f5e999d1c4e6c1b1f 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
@@ -921,8 +921,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
--- a/patches/chromium/expose_setuseragent_on_networkcontext.patch
+++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch
@ -33,10 +33,10 @@ index 0ccfe130f00ec3b6c75cd8ee04d5a2777e1fd00c..653829457d58bf92057cc36aa8a28970
   DISALLOW_COPY_AND_ASSIGN(StaticHttpUserAgentSettings);
 };
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index d39671bacc738e9185632bdebac31191d1a0c159..2465a053da8f95c3f643a908bbfe06143fa7d78d 100644
+index 8a00bf59c728217069000b1f1ece72e1540baf85..fc98675c01f64e6c674a7cdb4d9195edff446949 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1158,6 +1158,13 @@ void NetworkContext::SetNetworkConditions(
+@@ -1139,6 +1139,13 @@ void NetworkContext::SetNetworkConditions(
                                       std::move(network_conditions));
 }
 
@ -51,7 +51,7 @@ index d39671bacc738e9185632bdebac31191d1a0c159..2465a053da8f95c3f643a908bbfe0614
   // This may only be called on NetworkContexts created with the constructor
   // that calls MakeURLRequestContext().
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 23bbc41ddfee63dacd622a1aa3cf750682501c76..68888f46623667f00ac6b6f1f7fb7d33965333a0 100644
+index 06b1a0d550de946aa41efca2be4efde694cc24c7..fe7c5c6501838e480c2bc95823e9f562839ad99c 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
@@ -254,6 +254,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@ -63,10 +63,10 @@ index 23bbc41ddfee63dacd622a1aa3cf750682501c76..68888f46623667f00ac6b6f1f7fb7d33
   void SetEnableReferrers(bool enable_referrers) override;
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index b1e73dc3250bb8402d4becfd673fd9aa54ecd7fb..cfa9d0c197ca9851f13b088ecae4aba614c7ac55 100644
+index 7a62dfd110555d2bf6ed4be075967ce6396855ef..b35746e2850d7d724fcf3dc09ddbfea1ca56a746 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -964,6 +964,9 @@ interface NetworkContext {
+@@ -948,6 +948,9 @@ interface NetworkContext {
   SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
                        NetworkConditions? conditions);
 
@ -77,7 +77,7 @@ index b1e73dc3250bb8402d4becfd673fd9aa54ecd7fb..cfa9d0c197ca9851f13b088ecae4aba6
   SetAcceptLanguage(string new_accept_language);
 
 diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
-index feecbe157692fe205d176e3782b24c17b85f4e18..2bd5713a46616231a5af19a5357bfbd851105582 100644
+index f233265ccc0be9b412bf2e3e702e12614fa435c4..51006ddb52a0c4c4ea9f1cdb631cf4d75967bb66 100644
 --- a/services/network/test/test_network_context.h
 +++ b/services/network/test/test_network_context.h
@@ -117,6 +117,7 @@ class TestNetworkContext : public mojom::NetworkContext {
--- a/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
+++ b/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
@ -13,10 +13,10 @@ uses internally for things like menus and devtools.
 We can remove this patch once it has in some shape been upstreamed.

 diff --git a/ui/native_theme/native_theme.cc b/ui/native_theme/native_theme.cc
-index 2855ee596225d70f2ef7027073406f2c9f60ea62..7cff1321dc8af524db12be4ca0777ed049c2f918 100644
+index 2f4d54a14f47d39bf028842a8db8db3066bb4894..427c70e793d87eb6d0f0072adceae3ce98198d09 100644
 --- a/ui/native_theme/native_theme.cc
 +++ b/ui/native_theme/native_theme.cc
-@@ -268,6 +268,8 @@ base::Optional<SkColor> NativeTheme::GetColorProviderColor(
+@@ -274,6 +274,8 @@ base::Optional<SkColor> NativeTheme::GetColorProviderColor(
 }
 
 bool NativeTheme::ShouldUseDarkColors() const {
@ -26,12 +26,12 @@ index 2855ee596225d70f2ef7027073406f2c9f60ea62..7cff1321dc8af524db12be4ca0777ed0
 }
 
 diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
-index c0f051e820b134b003f23d8d7bc93024cf76d3d1..6b4c5e82797f383230b60772ff4b2fb462252d59 100644
+index 0196aa21e880a517461001e7bbb1f3399bbc3b37..9375f55b6ab4a897d4e837e681eedf0145af9302 100644
 --- a/ui/native_theme/native_theme.h
 +++ b/ui/native_theme/native_theme.h
-@@ -397,6 +397,22 @@ class NATIVE_THEME_EXPORT NativeTheme {
-       ColorId color_id,
-       ColorScheme color_scheme = ColorScheme::kDefault) const;
+@@ -402,6 +402,22 @@ class NATIVE_THEME_EXPORT NativeTheme {
+   SkColor GetUnprocessedSystemColor(ColorId color_id,
+                                     ColorScheme color_scheme) const;
 
 +  enum ThemeSource {
 +    kSystem,
@ -52,7 +52,7 @@ index c0f051e820b134b003f23d8d7bc93024cf76d3d1..6b4c5e82797f383230b60772ff4b2fb4
   // Returns a shared instance of the native theme that should be used for web
   // rendering. Do not use it in a normal application context (i.e. browser).
   // The returned object should not be deleted by the caller. This function is
-@@ -551,6 +567,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -568,6 +584,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
   bool forced_colors_ = false;
   PreferredColorScheme preferred_color_scheme_ = PreferredColorScheme::kLight;
   PreferredContrast preferred_contrast_ = PreferredContrast::kNoPreference;
@ -61,10 +61,10 @@ index c0f051e820b134b003f23d8d7bc93024cf76d3d1..6b4c5e82797f383230b60772ff4b2fb4
   DISALLOW_COPY_AND_ASSIGN(NativeTheme);
 };
 diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
-index e3962d04553dcdf27bbb878f39a47e279dc4959f..9c2b87278dc090da48082483aee331202a56ecc2 100644
+index 90e3b67bd5c78be3ea0d0f0e4ef94bc95ea375a2..510791b29b6b16f92eecb804912992fd843c4d9c 100644
 --- a/ui/native_theme/native_theme_win.cc
 +++ b/ui/native_theme/native_theme_win.cc
-@@ -740,6 +740,8 @@ bool NativeThemeWin::ShouldUseDarkColors() const {
+@@ -748,6 +748,8 @@ bool NativeThemeWin::ShouldUseDarkColors() const {
   // ...unless --force-dark-mode was specified in which case caveat emptor.
   if (InForcedColorsMode() && !IsForcedDarkMode())
     return false;
--- a/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch
@ -6,7 +6,7 @@ Subject: feat: allow disabling blink scheduler throttling per RenderView
 This allows us to disable throttling for hidden windows.

 diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
-index 517ee0e43e83da558964ae00b9c80219e5978ea2..c8e05b7e97b15170a7f3d41a673ec16a630d8feb 100644
+index a0dc55dc6751550527437b653f8a3ce782c755de..6e42cb67cc912620e32caaa40174cbd9c34218f1 100644
 --- a/content/browser/renderer_host/render_view_host_impl.cc
 +++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -601,6 +601,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
@ -48,7 +48,7 @@ index 0edd8ddc099b2e66869d2d4fff42f761d3be6079..bcc704efaf27f9b042b349fa0b097917
   // This interface should only be implemented inside content.
   friend class RenderViewHostImpl;
 diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
-index 3f455e17e167bd01a219abf2f6fd2b8e235cf3c8..5dd40d3e2f28cf53729801c6960a6f64d057bf7f 100644
+index 166b3d3aa70dc2d6e8123ea1df3d3cb400be747c..f3bccc47ab2fe2d192f7d11628c7bdcf04638d02 100644
 --- a/content/renderer/render_view_impl.h
 +++ b/content/renderer/render_view_impl.h
@@ -224,6 +224,8 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
@ -61,10 +61,10 @@ index 3f455e17e167bd01a219abf2f6fd2b8e235cf3c8..5dd40d3e2f28cf53729801c6960a6f64
 
 #if defined(OS_ANDROID)
 diff --git a/third_party/blink/public/mojom/page/page.mojom b/third_party/blink/public/mojom/page/page.mojom
-index e122d4ffb857023841dabcb6fed352d7586d8344..3c7cd1cb8b204024a0835150302ee8896e01ee45 100644
+index 464faabf887dcdefa26a747393ccce851bf035d7..7048eec311563bd6f2b9eeba145c418a0f8f6c2d 100644
 --- a/third_party/blink/public/mojom/page/page.mojom
 +++ b/third_party/blink/public/mojom/page/page.mojom
-@@ -73,4 +73,7 @@ interface PageBroadcast {
+@@ -76,4 +76,7 @@ interface PageBroadcast {
 
   // Set history offset and length.
   SetHistoryOffsetAndLength(int32 offset, int32 length);
@ -85,10 +85,10 @@ index e8212d4566666683d67590ef0fe11e452d71b6fc..b19500d4af881c795e84baff16e9973e
   // Visibility -----------------------------------------------------------
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 51dc16be3019edba22bfcd0c735f49337574dd59..87e81332dc8f81772facd93bae7ffd3f967b64cd 100644
+index 57d18d8d664bb06bc89aa83f27959f712684cca2..ba01fb7cbbff1535401cdc687570c9a86e2011dd 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -3524,6 +3524,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3512,6 +3512,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
   return GetPage()->GetPageScheduler();
 }
 
@ -102,7 +102,7 @@ index 51dc16be3019edba22bfcd0c735f49337574dd59..87e81332dc8f81772facd93bae7ffd3f
 void WebViewImpl::SetVisibilityState(
     mojom::blink::PageVisibilityState visibility_state,
     bool is_initial_state) {
-@@ -3536,7 +3543,8 @@ void WebViewImpl::SetVisibilityState(
+@@ -3524,7 +3531,8 @@ void WebViewImpl::SetVisibilityState(
   }
   GetPage()->SetVisibilityState(visibility_state, is_initial_state);
   GetPage()->GetPageScheduler()->SetPageVisible(
@ -113,10 +113,10 @@ index 51dc16be3019edba22bfcd0c735f49337574dd59..87e81332dc8f81772facd93bae7ffd3f
 
 mojom::blink::PageVisibilityState WebViewImpl::GetVisibilityState() {
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
-index 297d3e515abe14dec4909d94117ba64f91e43b44..8d7c16f677c63aea437d16ed1d5e35bfd82608fc 100644
+index 9afdc9a5f84380436c0435662ae5c633bc7482f6..25fc8941370cb9ab0dd93402f5118e0184e6aca1 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
-@@ -369,6 +369,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -384,6 +384,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
   LocalDOMWindow* PagePopupWindow() const;
 
   PageScheduler* Scheduler() const override;
@ -124,8 +124,8 @@ index 297d3e515abe14dec4909d94117ba64f91e43b44..8d7c16f677c63aea437d16ed1d5e35bf
   void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
                           bool is_initial_state) override;
   mojom::blink::PageVisibilityState GetVisibilityState() override;
-@@ -765,11 +766,18 @@ class CORE_EXPORT WebViewImpl final : public WebView,
-   SkColor background_color_override_ = Color::kTransparent;
+@@ -780,11 +781,18 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+ 
   float zoom_factor_override_ = 0.f;
 
 +  // TODO(bokan): Temporary debugging added to diagnose
--- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
+++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
@ -81,7 +81,7 @@ index 1026b739d283f0fc252fa2af83a6d4cf51bc8553..fe562ab60ce98b8bb0c5080a6428deb3
  private:
   const HWND hwnd_;
 diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
-index 8985715274291f6e847a5188bf30339e60f07aa3..00322d1fd7d94f2091aca5460644e122374e5c19 100644
+index 248021aeb18072215d77081158b73dc8107f8958..970171531b4a728becba5b0142471c2c976b7e35 100644
 --- a/components/viz/service/BUILD.gn
 +++ b/components/viz/service/BUILD.gn
@@ -129,6 +129,8 @@ viz_component("service") {
@ -484,10 +484,10 @@ index 0000000000000000000000000000000000000000..48fa86caaab3c15764f105eb7ad2aecf
 +
 +#endif  // COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_SOFTWARE_OUTPUT_DEVICE_PROXY_H_
 diff --git a/components/viz/service/display_embedder/software_output_device_win.cc b/components/viz/service/display_embedder/software_output_device_win.cc
-index 2bb30e5318b6b48c2e6d4b1f64a6a36c68f963d1..9e805f27a9d7d1c0aa68cdf9f48895c055ca7791 100644
+index 599b06c1765ef4ddbfeb2fd96e0875098f7c6ae1..2151fc8aa710162a3870639bd6e952df9d15a0be 100644
 --- a/components/viz/service/display_embedder/software_output_device_win.cc
 +++ b/components/viz/service/display_embedder/software_output_device_win.cc
-@@ -188,7 +188,7 @@ void SoftwareOutputDeviceWinProxy::EndPaintDelegated(
+@@ -191,7 +191,7 @@ void SoftwareOutputDeviceWinProxy::EndPaintDelegated(
   if (!canvas_)
     return;
 
@ -497,10 +497,10 @@ index 2bb30e5318b6b48c2e6d4b1f64a6a36c68f963d1..9e805f27a9d7d1c0aa68cdf9f48895c0
   waiting_on_draw_ack_ = true;
 
 diff --git a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-index c33992f7428957aa1e3cc0e919bba2ed577d9e5a..670baa641b14866d03db4cec0c718c724b0b7583 100644
+index 378ff94440c9f33ed3569d9818ca92083781cc48..831afb1678c889ac162666298849617d53bdc827 100644
 --- a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
 +++ b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-@@ -46,7 +46,8 @@ RootCompositorFrameSinkImpl::Create(
+@@ -47,7 +47,8 @@ RootCompositorFrameSinkImpl::Create(
       params->gpu_compositing, params->widget, params->renderer_settings);
   auto output_surface = output_surface_provider->CreateOutputSurface(
       params->widget, params->gpu_compositing, display_client.get(),
--- a/patches/chromium/fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch
+++ b/patches/chromium/fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch
@ -7,10 +7,10 @@ Subject:
 Disable usage of pthread_fchdir_np and pthread_chdir_np in MAS builds.

 diff --git a/base/process/launch_mac.cc b/base/process/launch_mac.cc
-index a0dfda42bd4bc3249e35c40fbe335fa22d007ded..d8d1ee58130fd9d75404aecc00196cc141b20d52 100644
+index 05ad8648a42cdca97d12167246a305373cb5aba3..e3c31792dbc3d9cc94c1e01aa3cfda4e35b6008c 100644
 --- a/base/process/launch_mac.cc
 +++ b/base/process/launch_mac.cc
-@@ -28,8 +28,10 @@ extern "C" {
+@@ -27,8 +27,10 @@ extern "C" {
 // descriptor. libpthread only exposes a syscall wrapper starting in
 // macOS 10.12, but the system call dates back to macOS 10.5. On older OSes,
 // the syscall is issued directly.
@ -21,7 +21,7 @@ index a0dfda42bd4bc3249e35c40fbe335fa22d007ded..d8d1ee58130fd9d75404aecc00196cc1
 
 int responsibility_spawnattrs_setdisclaim(posix_spawnattr_t attrs, int disclaim)
     API_AVAILABLE(macosx(10.14));
-@@ -97,21 +99,29 @@ class PosixSpawnFileActions {
+@@ -96,21 +98,29 @@ class PosixSpawnFileActions {
 };
 
 int ChangeCurrentThreadDirectory(const char* path) {
@ -51,7 +51,7 @@ index a0dfda42bd4bc3249e35c40fbe335fa22d007ded..d8d1ee58130fd9d75404aecc00196cc1
 }
 
 struct GetAppOutputOptions {
-@@ -231,11 +241,13 @@ Process LaunchProcess(const std::vector<std::string>& argv,
+@@ -230,11 +240,13 @@ Process LaunchProcess(const std::vector<std::string>& argv,
     file_actions.Inherit(STDERR_FILENO);
   }
 
--- a/patches/chromium/fix_properly_honor_printing_page_ranges.patch
+++ b/patches/chromium/fix_properly_honor_printing_page_ranges.patch
@ -10,7 +10,7 @@ them should they exist.
 This will be upstreamed.

 diff --git a/printing/printing_context_mac.h b/printing/printing_context_mac.h
-index f63f7f2674d9562f57dea4f9c9f473aa595a0c5f..78a46dbea7ff31209748ef47d541725397d80616 100644
+index 00c78a7446480a15a4dfa360ccdc438eaf1215c1..5b0db3e754ac6c9e335365173800d2e1a5ca629d 100644
 --- a/printing/printing_context_mac.h
 +++ b/printing/printing_context_mac.h
@@ -82,6 +82,10 @@ class PRINTING_EXPORT PrintingContextMac : public PrintingContext {
@ -25,7 +25,7 @@ index f63f7f2674d9562f57dea4f9c9f473aa595a0c5f..78a46dbea7ff31209748ef47d5417253
   // Returns true if duplex mode is set.
   bool SetDuplexModeInPrintSettings(mojom::DuplexMode mode);
 diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm
-index aa950b59390fdae9a5152affb7a7438cb78eb6f4..9b5307bda7b73cb502fe185be2a7c02e23a7722c 100644
+index ff9b3e08d49cb0daec83df36257729ff2636fe66..20031e220903f0882bef091ed048f47c4c5dc61c 100644
 --- a/printing/printing_context_mac.mm
 +++ b/printing/printing_context_mac.mm
@@ -189,7 +189,8 @@ PMPaper MatchPaper(CFArrayRef paper_list,
@ -100,7 +100,7 @@ index fe7fc797504dcc7097a3d79a2dab2c18de737048..20c63b1f657f2969850b31eaafdff7e5
   } else {
     // No need to bother, we don't know how many pages are available.
 diff --git a/ui/gtk/printing/print_dialog_gtk.cc b/ui/gtk/printing/print_dialog_gtk.cc
-index 01c9a6967203f0340f87390653476d4cd89fbd1f..deb9a72a9385cef416ed65eeb237e67239252d69 100644
+index d2ed5cbe4a48abe0026dda24a016da654e7e201a..d1bdf05c89e2c2aef71e8a8a2bf293725b2559d3 100644
 --- a/ui/gtk/printing/print_dialog_gtk.cc
 +++ b/ui/gtk/printing/print_dialog_gtk.cc
@@ -239,6 +239,24 @@ void PrintDialogGtk::UpdateSettings(
--- a/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch
+++ b/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch
@ -13,10 +13,10 @@ This patch can be removed once app.allowRendererProcessReuse is forced
 to true as then Chromiums assumptions around processes become correct.

 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 0945a202580d6eba49e48d68921f2624fe481b43..a8482b0db04ccdcabad001f51d8d9c85091b856d 100644
+index ce9d64d9770e53e501d561af25094dd8f79bf331..86e5356ec057fddd49e93c49e49156f95f4ed646 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3037,11 +3037,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
+@@ -3056,11 +3056,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
     WebContentsImpl* outermost = GetOutermostWebContents();
     if (event.button == blink::WebPointerProperties::Button::kBack &&
         outermost->GetController().CanGoBack()) {
--- a/patches/chromium/fix_use_electron_generated_resources.patch
+++ b/patches/chromium/fix_use_electron_generated_resources.patch
@ -12,7 +12,7 @@ as they will loaded as empty strings.
 * IDS_UTILITY_PROCESS_PRINTING_SERVICE_NAME on Windows

 diff --git a/chrome/browser/pdf/pdf_extension_util.cc b/chrome/browser/pdf/pdf_extension_util.cc
-index 33fd198d1c92ad20c5f6243bc64956a7d9488e1f..40e5444e48ad8a2b15bace12cf4a28165902ccc8 100644
+index 0944d8c843985ee2f72e28bca37105a681cb82bb..6b1a3a1b7f8b776323d321d0b425e040654646a9 100644
 --- a/chrome/browser/pdf/pdf_extension_util.cc
 +++ b/chrome/browser/pdf/pdf_extension_util.cc
@@ -9,8 +9,7 @@
--- a/patches/chromium/frame_host_manager.patch
+++ b/patches/chromium/frame_host_manager.patch
@ -42,10 +42,10 @@ index 65e627f2fa89352b0be27b5813d71a622bf1d326..113f4fd00f1cf994b39f64c9da387855
   // another SiteInstance for the same site.
   void RegisterSiteInstance(SiteInstanceImpl* site_instance);
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
-index c105cc7532d121c7bfb8c15d9be28288405ad81a..6614b1b70952ef6773d1f33e872f89c18827c00d 100644
+index 615b50b53728a37e7a60247cd66213dd4d5811b0..500668cd676911ee3bc871eb3ff6b33a66d01c6a 100644
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -1559,6 +1559,21 @@ void NavigationRequest::BeginNavigation() {
+@@ -1570,6 +1570,21 @@ void NavigationRequest::BeginNavigation() {
     if (IsSameDocument()) {
       render_frame_host_ = frame_tree_node_->current_frame_host();
     } else {
@ -67,7 +67,7 @@ index c105cc7532d121c7bfb8c15d9be28288405ad81a..6614b1b70952ef6773d1f33e872f89c1
       // Select an appropriate RenderFrameHost.
       std::string frame_host_choice_reason;
       render_frame_host_ =
-@@ -5663,6 +5678,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
+@@ -5750,6 +5765,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
           {WILL_START_REQUEST, {
               WILL_REDIRECT_REQUEST,
               WILL_PROCESS_RESPONSE,
@ -75,7 +75,7 @@ index c105cc7532d121c7bfb8c15d9be28288405ad81a..6614b1b70952ef6773d1f33e872f89c1
               READY_TO_COMMIT,
               DID_COMMIT,
               CANCELING,
-@@ -5676,10 +5692,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
+@@ -5763,10 +5779,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
               WILL_FAIL_REQUEST,
           }},
           {WILL_PROCESS_RESPONSE, {
@ -91,10 +91,10 @@ index c105cc7532d121c7bfb8c15d9be28288405ad81a..6614b1b70952ef6773d1f33e872f89c1
               NOT_STARTED,
               DID_COMMIT,
 diff --git a/content/browser/renderer_host/navigation_request.h b/content/browser/renderer_host/navigation_request.h
-index e40cd2050e330accefa14eb5153999e41f5e0186..3504430c9efda71e95f3e76e9d5de35c8f66c149 100644
+index fb6af6129bee6cb74dc8f41de6ebe1931b13494f..ac0aa6c2a808b9b696e408701bd114f402099ffa 100644
 --- a/content/browser/renderer_host/navigation_request.h
 +++ b/content/browser/renderer_host/navigation_request.h
-@@ -136,6 +136,10 @@ class CONTENT_EXPORT NavigationRequest
+@@ -139,6 +139,10 @@ class CONTENT_EXPORT NavigationRequest
     // asynchronous.
     WILL_PROCESS_RESPONSE,
 
@ -106,10 +106,10 @@ index e40cd2050e330accefa14eb5153999e41f5e0186..3504430c9efda71e95f3e76e9d5de35c
     READY_TO_COMMIT,
 
 diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
-index b0027728189403cf76371f9f7d6a4f614374f64a..0d2bdb0f06c26c093e1030590cfcbfca903deafe 100644
+index d3cc62fa063918b50ceb8f854bcc737f9e53193f..e09db90709c7b7b1c652d6e1b12e513d5bd6a10e 100644
 --- a/content/browser/renderer_host/render_frame_host_manager.cc
 +++ b/content/browser/renderer_host/render_frame_host_manager.cc
-@@ -2738,6 +2738,16 @@ scoped_refptr<SiteInstance>
+@@ -2804,6 +2804,16 @@ scoped_refptr<SiteInstance>
 RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
     NavigationRequest* request,
     std::string* reason) {
@ -126,7 +126,7 @@ index b0027728189403cf76371f9f7d6a4f614374f64a..0d2bdb0f06c26c093e1030590cfcbfca
   SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance();
 
   // All children of MHTML documents must be MHTML documents. They all live in
-@@ -2765,10 +2775,59 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -2831,10 +2841,59 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
   //
   // TODO(clamy): We should also consider as a candidate SiteInstance the
   // speculative SiteInstance that was computed on redirects.
@ -190,7 +190,7 @@ index b0027728189403cf76371f9f7d6a4f614374f64a..0d2bdb0f06c26c093e1030590cfcbfca
 
   // Account for renderer-initiated reload as well.
   // Needed as a workaround for https://crbug.com/1045524, remove it when it is
-@@ -2801,6 +2860,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -2867,6 +2926,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
     request->ResetStateForSiteInstanceChange();
   }
 
@ -201,10 +201,10 @@ index b0027728189403cf76371f9f7d6a4f614374f64a..0d2bdb0f06c26c093e1030590cfcbfca
 }
 
 diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc
-index c4e4bfa4546c4dcc4c9d2ccd36bbfb4a5ca9c615..9c0e3cd87dfdd7bfe11d8d0afb1995e76a0bc187 100644
+index 216d9a065146a10fd6187cde30ce725ac1acf2a8..807125e8b47793efe998b76e95e94aae62259107 100644
 --- a/content/browser/site_instance_impl.cc
 +++ b/content/browser/site_instance_impl.cc
-@@ -1003,6 +1003,10 @@ bool SiteInstanceImpl::HasRelatedSiteInstance(const SiteInfo& site_info) {
+@@ -1015,6 +1015,10 @@ bool SiteInstanceImpl::HasRelatedSiteInstance(const SiteInfo& site_info) {
   return browsing_instance_->HasSiteInstance(site_info);
 }
 
@ -216,10 +216,10 @@ index c4e4bfa4546c4dcc4c9d2ccd36bbfb4a5ca9c615..9c0e3cd87dfdd7bfe11d8d0afb1995e7
     const GURL& url) {
   return GetRelatedSiteInstanceImpl(
 diff --git a/content/browser/site_instance_impl.h b/content/browser/site_instance_impl.h
-index 7a09d84c4b94a2d66d7efcb02cd9ad88b10bec29..9b12afc7d031c6763b17d970d9edec265e5b2431 100644
+index 95da3d92e7732c233148ebdc8df0e8e440109bee..b32f71aaedad4e291cd18009c23845f754eea7ca 100644
 --- a/content/browser/site_instance_impl.h
 +++ b/content/browser/site_instance_impl.h
-@@ -401,6 +401,7 @@ class CONTENT_EXPORT SiteInstanceImpl final : public SiteInstance,
+@@ -409,6 +409,7 @@ class CONTENT_EXPORT SiteInstanceImpl final : public SiteInstance,
   BrowserContext* GetBrowserContext() override;
   const GURL& GetSiteURL() override;
   scoped_refptr<SiteInstance> GetRelatedSiteInstance(const GURL& url) override;
@ -228,7 +228,7 @@ index 7a09d84c4b94a2d66d7efcb02cd9ad88b10bec29..9b12afc7d031c6763b17d970d9edec26
   size_t GetRelatedActiveContentsCount() override;
   bool RequiresDedicatedProcess() override;
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index 523084f820e841bbf8b8fa3974f94a4e938db81b..89344011112bde895c206e2c650d14c4567cff64 100644
+index 8d899d675d0eca0856269e9887371a6f633ef767..060d1fd273f4cd8da5898c0eb5b3b21bd38d766a 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
@@ -69,6 +69,21 @@
@ -254,7 +254,7 @@ index 523084f820e841bbf8b8fa3974f94a4e938db81b..89344011112bde895c206e2c650d14c4
     const MainFunctionParams& parameters) {
   return nullptr;
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index b1c4ad7a48f760d2ba7908c9611b5f894af575d6..373093da3974d774dad68b4172bca7d9cb22b71d 100644
+index 52a300a553742469ad7eea7ccb85e5e9988363b7..656706320502312bd81a3af4e4185692cc841adb 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
@@ -257,8 +257,45 @@ class CONTENT_EXPORT ContentBrowserClient {
--- a/patches/chromium/gin_enable_disable_v8_platform.patch
+++ b/patches/chromium/gin_enable_disable_v8_platform.patch
@ -38,7 +38,7 @@ index f23af2d9738f3aa76e3a49301e1c3216ee4a64b4..ede178acabc63c3c33d6ce93efd5632b
   v8::Isolate* isolate() { return isolate_; }
 
 diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-index ac74939f36630673c4ee9db02bef320f17c86154..3dd0f2be0be9ac5194523333aa0d822eaa9eb814 100644
+index e9cc71b968428b8806db8ad5089cc84f28f8cdbb..e5eff4f655bbaa1379499c2e480a930648e8d84b 100644
 --- a/gin/v8_initializer.cc
 +++ b/gin/v8_initializer.cc
@@ -198,12 +198,14 @@ enum LoadV8FileResult {
--- a/patches/chromium/gritsettings_resource_ids.patch
+++ b/patches/chromium/gritsettings_resource_ids.patch
@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.

 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index 915758d60d73ad915fbac47e2057882c7827fbd3..247ac45694d77460d7d17b213f1c6419ece8a460 100644
+index cecbbaf47ca01d6a27b1fae6e973658a92a524ad..e90cd439ed661f8364394f5a1097129bc8fb5097 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -733,6 +733,11 @@
+@@ -753,6 +753,11 @@
     "includes": [3880],
   },
 
--- a/patches/chromium/mas_disable_remote_accessibility.patch
+++ b/patches/chromium/mas_disable_remote_accessibility.patch
@ -47,7 +47,7 @@ index 9ddda9116e7284cbccde8a51e23ad7560dd06367..e846091ad99b0154636489e53491209f
 
 }  // namespace
 diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-index 93db386ed8e7fa0d0f21c25d861b44bb1ba9f0c5..0969062960b4435970617a75ed2219e9028c507a 100644
+index 276ef2a830848af488f12746d25f12413101342e..82d2d75adc0b659be392fc8d6068fa09880e1993 100644
 --- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
 +++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
@@ -550,10 +550,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
@ -90,7 +90,7 @@ index c3a9fbf0f9d2b80c1de42a22ad094a286f0b559b..02493d4b62c98a3aebd3e460c459218a
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostNSViewBridgeOwner);
 };
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
-index 9997e703d7c2b7c9a35a598b0c5b9d42cfa6769c..f78e3493abcae70f1ebf6ed4fa54b0feea358f30 100644
+index dee1fd0bbbb3239ed435f9adbfc50fa6f898a7de..69d9fc9da5638e1e0c908210959cb0e8440babaa 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.h
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.h
@@ -46,7 +46,9 @@ class ScopedPasswordInputEnabler;
@ -117,7 +117,7 @@ index 9997e703d7c2b7c9a35a598b0c5b9d42cfa6769c..f78e3493abcae70f1ebf6ed4fa54b0fe
   // Used to force the NSApplication's focused accessibility element to be the
   // content::BrowserAccessibilityCocoa accessibility tree when the NSView for
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 44a682e8b37d452fe39a6d1830ce33da693c4031..7d2426379b8c7b72b735ab936c529596e46dd9d1 100644
+index dcde566593996b62833f20a65a24c658d3fcd629..925b5ab3e666c14f01745f59859ce25f14f64899 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -236,8 +236,10 @@
@ -170,7 +170,7 @@ index 44a682e8b37d452fe39a6d1830ce33da693c4031..7d2426379b8c7b72b735ab936c529596
 
 ///////////////////////////////////////////////////////////////////////////////
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index 6868f3ce6c48bce32c58a386640b0fe6ede91688..91518596912208fb086215f62570608869f48bc0 100644
+index eee1067a534be43aa47bb0d803011ddb8edd3f83..b9c9c32e3e3d71e10fa8f341a000696b54822e6a 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
@@ -317,6 +317,13 @@ component("base") {
@ -208,7 +208,7 @@ index e7adfee3210ec723c687adfcc4bee8827ef643e7..25a924a47eeb30d783ef83dbb4896c4b
 +
 #endif  // UI_BASE_COCOA_REMOTE_ACCESSIBILITY_API_H_
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.h b/ui/views/cocoa/native_widget_mac_ns_window_host.h
-index 6d218f9e38f4ea6c109aa1a7256bdb37a76056b3..0bbe5a8e6c217405cf45717c0777bed65f28b182 100644
+index 69d612b69a91228c55bd71ed15244dc7d19ea4b7..a3078e7372bf1e928dcd8c0f023ae8e5d6f051a0 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.h
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.h
@@ -30,7 +30,9 @@
@ -236,7 +236,7 @@ index 6d218f9e38f4ea6c109aa1a7256bdb37a76056b3..0bbe5a8e6c217405cf45717c0777bed6
   // Used to force the NSApplication's focused accessibility element to be the
   // views::Views accessibility tree when the NSView for this is focused.
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
-index c2a1dc7a9ff9887a1eb72b6a0905c41bd9def353..e3a7bdb35324d91f9e9d05ad1835480cdf8463a2 100644
+index eecf660ac81c6dbd85ee6cbcf490fb434cb5cf0e..19e145d22eeabb871799f6a7abb113c8c62a25a1 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
@@ -284,14 +284,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
--- a/patches/chromium/mas_no_private_api.patch
+++ b/patches/chromium/mas_no_private_api.patch
@ -82,10 +82,10 @@ index 88f339d1669436db9c1e4d048a46fc28038c83fe..2e194c5174c24552eb684faa339ad92b
 OptionalNSObject MakePairArray(const OptionalNSObject& obj1,
                                const OptionalNSObject& obj2) {
 diff --git a/content/browser/accessibility/browser_accessibility_cocoa.h b/content/browser/accessibility/browser_accessibility_cocoa.h
-index a6493f1c466fcfbc9253e68fecac7c86ec69f075..d7bfd4847e99da466e9e2b5fae46f0b89220ad55 100644
+index eff8d3fe2d47c519952e74ca2d6238ad39429d74..ef74a8983171bb720e4be7b1efa0b1350550727d 100644
 --- a/content/browser/accessibility/browser_accessibility_cocoa.h
 +++ b/content/browser/accessibility/browser_accessibility_cocoa.h
-@@ -151,7 +151,9 @@ id AXTextMarkerRangeFrom(id anchor_text_marker, id focus_text_marker);
+@@ -157,7 +157,9 @@ id AXTextMarkerRangeFrom(id anchor_text_marker, id focus_text_marker);
 @property(nonatomic, readonly) NSNumber* enabled;
 // Returns a text marker that points to the last character in the document that
 // can be selected with Voiceover.
@ -95,7 +95,7 @@ index a6493f1c466fcfbc9253e68fecac7c86ec69f075..d7bfd4847e99da466e9e2b5fae46f0b8
 @property(nonatomic, readonly) NSNumber* expanded;
 @property(nonatomic, readonly) NSNumber* focused;
 @property(nonatomic, readonly) NSNumber* grabbed;
-@@ -163,7 +165,9 @@ id AXTextMarkerRangeFrom(id anchor_text_marker, id focus_text_marker);
+@@ -169,7 +171,9 @@ id AXTextMarkerRangeFrom(id anchor_text_marker, id focus_text_marker);
 // Index of a row, column, or tree item.
 @property(nonatomic, readonly) NSNumber* index;
 @property(nonatomic, readonly) NSNumber* treeItemRowIndex;
@ -105,7 +105,7 @@ index a6493f1c466fcfbc9253e68fecac7c86ec69f075..d7bfd4847e99da466e9e2b5fae46f0b8
 @property(nonatomic, readonly) NSString* invalid;
 @property(nonatomic, readonly) NSNumber* isMultiSelectable;
 @property(nonatomic, readonly) NSString* placeholderValue;
-@@ -186,14 +190,18 @@ id AXTextMarkerRangeFrom(id anchor_text_marker, id focus_text_marker);
+@@ -192,14 +196,18 @@ id AXTextMarkerRangeFrom(id anchor_text_marker, id focus_text_marker);
 // The object is selected as a whole.
 @property(nonatomic, readonly) NSNumber* selected;
 @property(nonatomic, readonly) NSArray* selectedChildren;
@ -125,7 +125,7 @@ index a6493f1c466fcfbc9253e68fecac7c86ec69f075..d7bfd4847e99da466e9e2b5fae46f0b8
 // is concerned.
 @property(nonatomic, readonly) NSString* subrole;
 diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
-index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3c339e31f 100644
+index 86e56961584a26746cc254e8d0f53fe29f62fdb9..2d8265b3d41ce834d29f2764daf4be4aad15a1d1 100644
 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm
 +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -202,6 +202,7 @@
@ -215,7 +215,7 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
       {NSAccessibilitySizeAttribute, @"size"},
       {NSAccessibilitySortDirectionAttribute, @"sortDirection"},
       {NSAccessibilitySubroleAttribute, @"subrole"},
-@@ -1362,6 +1376,7 @@ - (NSNumber*)enabled {
+@@ -1370,6 +1384,7 @@ - (NSNumber*)enabled {
            ax::mojom::Restriction::kDisabled);
 }
 
@ -223,7 +223,7 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
 // Returns a text marker that points to the last character in the document that
 // can be selected with VoiceOver.
 - (id)endTextMarker {
-@@ -1370,6 +1385,7 @@ - (id)endTextMarker {
+@@ -1378,6 +1393,7 @@ - (id)endTextMarker {
   BrowserAccessibility::AXPosition position = _owner->CreatePositionAt(0);
   return CreateTextMarker(position->CreatePositionAtEndOfContent());
 }
@ -231,7 +231,7 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
 
 - (NSNumber*)expanded {
   if (![self instanceActive])
-@@ -1570,6 +1586,7 @@ - (bool)findRowIndex:(BrowserAccessibilityCocoa*)toFind
+@@ -1578,6 +1594,7 @@ - (bool)findRowIndex:(BrowserAccessibilityCocoa*)toFind
   return false;
 }
 
@ -239,7 +239,7 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
 - (NSNumber*)insertionPointLineNumber {
   if (![self instanceActive])
     return nil;
-@@ -1595,6 +1612,7 @@ - (NSNumber*)insertionPointLineNumber {
+@@ -1603,6 +1620,7 @@ - (NSNumber*)insertionPointLineNumber {
                        caretPosition->AsTextPosition()->text_offset());
   return @(std::distance(lineBreaks.begin(), iterator));
 }
@ -247,8 +247,8 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
 
 // Returns whether or not this node should be ignored in the
 // accessibility tree.
-@@ -1946,8 +1964,12 @@ - (BOOL)shouldExposeTitleUIElement {
-       return content::AXTextEdit(newValue, base::string16(), nil);
+@@ -1954,8 +1972,12 @@ - (BOOL)shouldExposeTitleUIElement {
+       return content::AXTextEdit(newValue, std::u16string(), nil);
     }
   }
 +#ifndef MAS_BUILD
@ -260,7 +260,7 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
 }
 
 - (BOOL)instanceActive {
-@@ -2272,6 +2294,7 @@ - (NSArray*)selectedChildren {
+@@ -2283,6 +2305,7 @@ - (NSArray*)selectedChildren {
   return ret;
 }
 
@ -268,7 +268,7 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
 - (NSString*)selectedText {
   if (![self instanceActive])
     return nil;
-@@ -2283,11 +2306,13 @@ - (NSString*)selectedText {
+@@ -2294,11 +2317,13 @@ - (NSString*)selectedText {
     return nil;
   return base::SysUTF16ToNSString(range.GetText());
 }
@ -282,7 +282,7 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
 - (NSValue*)selectedTextRange {
   if (![self instanceActive])
     return nil;
-@@ -2312,7 +2337,9 @@ - (NSValue*)selectedTextRange {
+@@ -2323,7 +2348,9 @@ - (NSValue*)selectedTextRange {
   int selLength = range.GetText().length();
   return [NSValue valueWithRange:NSMakeRange(selStart, selLength)];
 }
@ -292,7 +292,7 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
 - (id)selectedTextMarkerRange {
   if (![self instanceActive])
     return nil;
-@@ -2324,6 +2351,7 @@ - (id)selectedTextMarkerRange {
+@@ -2335,6 +2362,7 @@ - (id)selectedTextMarkerRange {
   // words correctly.
   return CreateTextMarkerRange(ax_range.AsBackwardRange());
 }
@ -300,7 +300,7 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
 
 - (NSValue*)size {
   if (![self instanceActive])
-@@ -2356,6 +2384,7 @@ - (NSString*)sortDirection {
+@@ -2367,6 +2395,7 @@ - (NSString*)sortDirection {
   return nil;
 }
 
@ -308,7 +308,7 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
 // Returns a text marker that points to the first character in the document that
 // can be selected with VoiceOver.
 - (id)startTextMarker {
-@@ -2364,6 +2393,7 @@ - (id)startTextMarker {
+@@ -2375,6 +2404,7 @@ - (id)startTextMarker {
   BrowserAccessibility::AXPosition position = _owner->CreatePositionAt(0);
   return CreateTextMarker(position->CreatePositionAtStartOfContent());
 }
@ -316,7 +316,7 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
 
 // Returns a subrole based upon the role.
 - (NSString*)subrole {
-@@ -2693,12 +2723,14 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range {
+@@ -2704,12 +2734,14 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range {
   NSMutableAttributedString* attributedInnerText =
       [[[NSMutableAttributedString alloc]
           initWithString:base::SysUTF16ToNSString(innerText)] autorelease];
@ -331,7 +331,7 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
 
   return [attributedInnerText attributedSubstringFromRange:range];
 }
-@@ -2811,6 +2843,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
+@@ -2822,6 +2854,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
       return ToBrowserAccessibilityCocoa(cell);
   }
 
@ -339,7 +339,7 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
   if ([attribute
           isEqualToString:
               NSAccessibilityUIElementForTextMarkerParameterizedAttribute]) {
-@@ -3134,6 +3167,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
+@@ -3145,6 +3178,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
 
     return CreateTextMarker(root->CreatePositionAt(index));
   }
@ -347,7 +347,7 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
 
   if ([attribute isEqualToString:
                      NSAccessibilityBoundsForRangeParameterizedAttribute]) {
-@@ -3164,6 +3198,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
+@@ -3175,6 +3209,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
     return nil;
   }
 
@ -355,7 +355,7 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
   if ([attribute
           isEqualToString:
               NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) {
-@@ -3281,6 +3316,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
+@@ -3292,6 +3327,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
 
     return @(child->GetIndexInParent());
   }
@ -363,7 +363,7 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
 
   return nil;
 }
-@@ -3810,6 +3846,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
+@@ -3821,6 +3857,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
         _owner->CreatePositionAt(range.location),
         _owner->CreatePositionAt(NSMaxRange(range))));
   }
@ -371,7 +371,7 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
   if ([attribute
           isEqualToString:NSAccessibilitySelectedTextMarkerRangeAttribute]) {
     BrowserAccessibility::AXRange range = CreateRangeFromTextMarkerRange(value);
-@@ -3820,6 +3857,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
+@@ -3831,6 +3868,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
         BrowserAccessibility::AXRange(range.anchor()->AsLeafTextPosition(),
                                       range.focus()->AsLeafTextPosition()));
   }
@ -380,10 +380,10 @@ index b0e3b8d22bfb3eda00612985454718ecaca91e83..6e487fa6382119d82f4fb8eeefd6c3a3
 
 - (id)accessibilityFocusedUIElement {
 diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
-index bf9b2cf399c88c3b08a727b492cd82106e53264b..3196760eb16e1f3642a612a6efd82b174f074f36 100644
+index 2a5163acf68b8a26b562dd0ab54e78fb408e89fe..98a5b1efc461d8f46becd78a4e19c410300e40e0 100644
 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
 +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
-@@ -484,7 +484,7 @@ void PostAnnouncementNotification(NSString* announcement) {
+@@ -482,7 +482,7 @@ void PostAnnouncementNotification(NSString* announcement) {
   if (native_focus_object && [native_focus_object instanceActive]) {
     [user_info setObject:native_focus_object
                   forKey:ui::NSAccessibilityTextChangeElement];
@ -392,7 +392,7 @@ index bf9b2cf399c88c3b08a727b492cd82106e53264b..3196760eb16e1f3642a612a6efd82b17
     id selected_text = [native_focus_object selectedTextMarkerRange];
     if (selected_text) {
       NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute =
-@@ -492,6 +492,7 @@ void PostAnnouncementNotification(NSString* announcement) {
+@@ -490,6 +490,7 @@ void PostAnnouncementNotification(NSString* announcement) {
       [user_info setObject:selected_text
                     forKey:NSAccessibilitySelectedTextMarkerRangeAttribute];
     }
--- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
+++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
@ -7,10 +7,10 @@ This adds a callback from the network service that's used to implement
 session.setCertificateVerifyCallback.

 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 2829dc39cd506a196c48ae0397f8dce1f33ce251..d39671bacc738e9185632bdebac31191d1a0c159 100644
+index 8e53d65ddca7b54a6effd1767257a4d8239251d8..8a00bf59c728217069000b1f1ece72e1540baf85 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -117,6 +117,11 @@
+@@ -116,6 +116,11 @@
 #include "services/network/url_loader.h"
 #include "services/network/url_request_context_builder_mojo.h"
 
@ -22,7 +22,7 @@ index 2829dc39cd506a196c48ae0397f8dce1f33ce251..d39671bacc738e9185632bdebac31191
 #if BUILDFLAG(IS_CT_SUPPORTED)
 #include "components/certificate_transparency/chrome_ct_policy_enforcer.h"
 #include "components/certificate_transparency/chrome_require_ct_delegate.h"
-@@ -375,6 +380,79 @@ bool SCTAuditingDelegate::IsSCTAuditingEnabled() {
+@@ -374,6 +379,79 @@ bool SCTAuditingDelegate::IsSCTAuditingEnabled() {
 
 }  // namespace
 
@ -102,7 +102,7 @@ index 2829dc39cd506a196c48ae0397f8dce1f33ce251..d39671bacc738e9185632bdebac31191
 constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
 
 NetworkContext::PendingCertVerify::PendingCertVerify() = default;
-@@ -574,6 +652,13 @@ void NetworkContext::SetClient(
+@@ -573,6 +651,13 @@ void NetworkContext::SetClient(
   client_.Bind(std::move(client));
 }
 
@ -116,7 +116,7 @@ index 2829dc39cd506a196c48ae0397f8dce1f33ce251..d39671bacc738e9185632bdebac31191
 void NetworkContext::CreateURLLoaderFactory(
     mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
     mojom::URLLoaderFactoryParamsPtr params) {
-@@ -1947,6 +2032,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -1930,6 +2015,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
         std::move(cert_verifier));
     cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_);
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
@ -127,7 +127,7 @@ index 2829dc39cd506a196c48ae0397f8dce1f33ce251..d39671bacc738e9185632bdebac31191
 
   builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 9b38859a97361c640ef132cfc42606e7dc9b34d2..23bbc41ddfee63dacd622a1aa3cf750682501c76 100644
+index 72885bc1d20a4da5ad4df3fb8185f05bcf6fbfba..06b1a0d550de946aa41efca2be4efde694cc24c7 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
@@ -90,6 +90,7 @@ class DomainReliabilityMonitor;
@ -157,7 +157,7 @@ index 9b38859a97361c640ef132cfc42606e7dc9b34d2..23bbc41ddfee63dacd622a1aa3cf7506
   // CertNetFetcher is not used by the current platform, or if the actual
   // net::CertVerifier is instantiated outside of the network service.
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 7d708f26098739fc60e3f698c5ca9fd3843c242a..b1e73dc3250bb8402d4becfd673fd9aa54ecd7fb 100644
+index 49aefdb660cf522e44ce22bb7d183481d0948e85..7a62dfd110555d2bf6ed4be075967ce6396855ef 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
@@ -192,6 +192,17 @@ struct CTPolicy {
@ -178,7 +178,7 @@ index 7d708f26098739fc60e3f698c5ca9fd3843c242a..b1e73dc3250bb8402d4becfd673fd9aa
 // Parameters for constructing a network context.
 struct NetworkContextParams {
   // Name used by memory tools to identify the context.
-@@ -744,6 +755,9 @@ interface NetworkContext {
+@@ -728,6 +739,9 @@ interface NetworkContext {
   // Sets a client for this network context.
   SetClient(pending_remote<NetworkContextClient> client);
 
--- a/patches/chromium/notification_provenance.patch
+++ b/patches/chromium/notification_provenance.patch
@ -7,10 +7,10 @@ Pass RenderProcessHost through to PlatformNotificationService
 so Electron can identify which renderer a notification came from.

 diff --git a/content/browser/notifications/blink_notification_service_impl.cc b/content/browser/notifications/blink_notification_service_impl.cc
-index d756a1b8cfeba5900c95863ca29cb15d9e1b15e4..3159df3456483453b9b362bb8942b45160d67b4d 100644
+index deacfeefaa2fde66378fed29bb29d4bfbcaecf85..d13758a82dc0a809d0812f07caf79316b4b321b4 100644
 --- a/content/browser/notifications/blink_notification_service_impl.cc
 +++ b/content/browser/notifications/blink_notification_service_impl.cc
-@@ -87,9 +87,11 @@ BlinkNotificationServiceImpl::BlinkNotificationServiceImpl(
+@@ -88,9 +88,11 @@ BlinkNotificationServiceImpl::BlinkNotificationServiceImpl(
     PlatformNotificationContextImpl* notification_context,
     BrowserContext* browser_context,
     scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
@ -22,7 +22,7 @@ index d756a1b8cfeba5900c95863ca29cb15d9e1b15e4..3159df3456483453b9b362bb8942b451
       browser_context_(browser_context),
       service_worker_context_(std::move(service_worker_context)),
       origin_(origin),
-@@ -150,8 +152,9 @@ void BlinkNotificationServiceImpl::DisplayNonPersistentNotification(
+@@ -151,8 +153,9 @@ void BlinkNotificationServiceImpl::DisplayNonPersistentNotification(
       notification_id, std::move(event_listener_remote));
 
   GetNotificationService(browser_context_)
@ -108,10 +108,10 @@ index 60558d5f40b765ed3ca2f7d1abc1b95f7518fee9..ab44370dc89f64fe2b86089fd9781b71
       mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
 
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 5b0ced0bfe7635495bd7e418367126335373633c..5e67fd252d6ce17d8093b81d89dec32756a8ba3b 100644
+index 1b7c03f529ec864c9fb30887137b92317dcd1f11..bb60223620f6aab8d48db90ddc9f8b511834f692 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -2179,7 +2179,7 @@ void RenderProcessHostImpl::CreateNotificationService(
+@@ -2107,7 +2107,7 @@ void RenderProcessHostImpl::CreateNotificationService(
     mojo::PendingReceiver<blink::mojom::NotificationService> receiver) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
@ -142,7 +142,7 @@ index ca61088079c4150fcf389504ddcf26bcf6bf69cd..d9c034c39890eef1fe3d95c6d7c0ae68
       const GURL& origin,
       const blink::PlatformNotificationData& notification_data,
 diff --git a/content/test/mock_platform_notification_service.cc b/content/test/mock_platform_notification_service.cc
-index 2f5b8be21c8b37bb6a0c7fe52c87cb7f9debbca0..7934f6e625584466ff0aabc69583343c728759ea 100644
+index 1d8a0687f9ec7e7894c74ac94f1648ad3c1621c8..05450dbe825552e00136837ee4ec4e5373201a45 100644
 --- a/content/test/mock_platform_notification_service.cc
 +++ b/content/test/mock_platform_notification_service.cc
@@ -30,6 +30,7 @@ MockPlatformNotificationService::MockPlatformNotificationService(
@ -154,7 +154,7 @@ index 2f5b8be21c8b37bb6a0c7fe52c87cb7f9debbca0..7934f6e625584466ff0aabc69583343c
     const GURL& origin,
     const blink::PlatformNotificationData& notification_data,
 diff --git a/content/test/mock_platform_notification_service.h b/content/test/mock_platform_notification_service.h
-index 6d108f9884f7e8f608b70ec33d286a06346e7456..4650a01c2d090c5957eb7a7e21f124489513142a 100644
+index caf6118cc1f0d99b054d2361648751be31368387..ea906b97850c676951a554af288845bb95d6e2a8 100644
 --- a/content/test/mock_platform_notification_service.h
 +++ b/content/test/mock_platform_notification_service.h
@@ -47,6 +47,7 @@ class MockPlatformNotificationService : public PlatformNotificationService {
--- a/patches/chromium/patch_the_ensure_gn_version_py_script_to_work_on_mac_ci.patch
+++ b/patches/chromium/patch_the_ensure_gn_version_py_script_to_work_on_mac_ci.patch
@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Apthorp <nornagon@nornagon.net>
-Date: Fri, 12 Apr 2019 12:47:57 -0700
-Subject: patch_the_ensure_gn_version_py_script_to_work_on_mac_ci.patch
-
-This patches the ensure_gn_version_py script to work on macOS CI.
-This script is temporary until https://crbug.com/944667 is resolved. We need to
-patch it because on mac CI, we check out the source code on Linux, which
-confuses the script.
-
-diff --git a/buildtools/ensure_gn_version.py b/buildtools/ensure_gn_version.py
-index cfc75a37792a93f209a0e7543d577a18d004a615..dd8c3468a914f44050b19002cb2c2df312038398 100755
--- a/buildtools/ensure_gn_version.py
-+++ b/buildtools/ensure_gn_version.py
-@@ -45,6 +45,11 @@ def ChmodGnFile(path_to_exe):
-            stat.S_IROTH | stat.S_IXOTH)
- 
- def main():
-+  # NB. on Electron's CI we check out the macOS source on Linux. Bypass this
-+  # check as it's not relevant on Electron CI and it gets confused.
-+  if os.environ.get('CI') is not None:
-+    return 0
-+
-   parser = argparse.ArgumentParser()
-   parser.add_argument('version',
-           help='CIPD "git_revision:XYZ" label for GN to sync to')
--- a/patches/chromium/picture-in-picture.patch
+++ b/patches/chromium/picture-in-picture.patch
@ -9,7 +9,7 @@ don't get errors for Chrome's generated resources, which are non-existent
 because we don't generate them in our build.

 diff --git a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
-index 7c81d93e92400874b88b639fde5aaa937efdcace..7f7ca0c53dbc41e06b1c566ae605c76d05e9abcb 100644
+index 84b64238fdf3a4cb13226af338a1cb3257f3a869..3fb23fab89abdb1eca15b549c9495edd0af03472 100644
 --- a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
 +++ b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
@@ -4,7 +4,7 @@
@ -22,7 +22,7 @@ index 7c81d93e92400874b88b639fde5aaa937efdcace..7f7ca0c53dbc41e06b1c566ae605c76d
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/color_palette.h"
 diff --git a/chrome/browser/ui/views/overlay/close_image_button.cc b/chrome/browser/ui/views/overlay/close_image_button.cc
-index 6ea71449bf68081bd358c280c3c0b65af23fc97c..8e1c9e5e2cdd464ca1b5e6407b5dddccd31cdb2c 100644
+index a4f6f5dbbf08fc2c7e5f158d0ad170f98c80b4e4..916898ce712ce3327788882fa60048b7390731ee 100644
 --- a/chrome/browser/ui/views/overlay/close_image_button.cc
 +++ b/chrome/browser/ui/views/overlay/close_image_button.cc
@@ -5,7 +5,7 @@
@ -77,7 +77,7 @@ index b148e526ebb4de0111a07a971f038141889bda31..a163cdf5841186235513d9bd9d4ad727
   Browser* browser =
       chrome::FindBrowserWithWebContents(controller->GetWebContents());
 diff --git a/chrome/browser/ui/views/overlay/playback_image_button.cc b/chrome/browser/ui/views/overlay/playback_image_button.cc
-index c0fe1f138f441b691ac2cec2242bfc4d3bdf79ca..473eb45178549385c52fcce2e9ff0b2c77dd328d 100644
+index 578d17812c1eedcd262b13c1a38338876a7b455e..774b1376750694e5082b88a0f1a15328e0766985 100644
 --- a/chrome/browser/ui/views/overlay/playback_image_button.cc
 +++ b/chrome/browser/ui/views/overlay/playback_image_button.cc
@@ -5,7 +5,7 @@
@ -90,7 +90,7 @@ index c0fe1f138f441b691ac2cec2242bfc4d3bdf79ca..473eb45178549385c52fcce2e9ff0b2c
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 diff --git a/chrome/browser/ui/views/overlay/resize_handle_button.cc b/chrome/browser/ui/views/overlay/resize_handle_button.cc
-index 51ce84d8e294a35e4c9d59387bdc7df0d7828070..03dd9142eb8cb899d856f1410694b152189102ab 100644
+index 5598da600a3172bde389d34537230e1502c05df1..a63d65a715de32e9ccad653bdbdf12b154265f32 100644
 --- a/chrome/browser/ui/views/overlay/resize_handle_button.cc
 +++ b/chrome/browser/ui/views/overlay/resize_handle_button.cc
@@ -5,7 +5,7 @@
@ -116,7 +116,7 @@ index e5a05b7b04c9679f0b61f0b997f5326ccf881dbf..7ddd4d5f9b55a403b207445f86d78ec6
 #include "ui/gfx/color_palette.h"
 #include "ui/views/background.h"
 diff --git a/chrome/browser/ui/views/overlay/track_image_button.cc b/chrome/browser/ui/views/overlay/track_image_button.cc
-index dbcbbabe7df945f797559b46eaa04f02162299e0..1852ff15198970a92275d65582ec19c55a125314 100644
+index 82b18daa41184fa97da3cfca2fd80d766dfa40ba..bf00f25c64b3e126b61b2e2dc2a29fb9d46ebe7d 100644
 --- a/chrome/browser/ui/views/overlay/track_image_button.cc
 +++ b/chrome/browser/ui/views/overlay/track_image_button.cc
@@ -5,7 +5,7 @@
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@ -11,7 +11,7 @@ majority of changes originally come from these PRs:
 This patch also fixes callback for manual user cancellation and success.

 diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc
-index 1f33cee63624693729b27caabb9f25891cf169f8..3d20b4e11497d91bf24b433846440a26df3effa4 100644
+index 3cff6d2a77cdd5e9303873c5e70d27f08a1b95c2..a0eeb96a74e0e40d0656c9670594f15a0dd906a0 100644
 --- a/chrome/browser/printing/print_job.cc
 +++ b/chrome/browser/printing/print_job.cc
@@ -350,18 +350,25 @@ void PrintJob::StartPdfToEmfConversion(
@ -43,7 +43,7 @@ index 1f33cee63624693729b27caabb9f25891cf169f8..3d20b4e11497d91bf24b433846440a26
   using RenderMode = PdfRenderSettings::Mode;
   RenderMode mode;
 diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
-index 47a5b3c2a11ec595ff926df10f856ed3c5375c55..38769ab454b143a1f50d1291a363092cd3dad407 100644
+index 91edb6e296fd94491a7b379f289e3f7a0b91a53b..ec4fd72f889188869a8ee05ffee2132207b98d48 100644
 --- a/chrome/browser/printing/print_job_worker.cc
 +++ b/chrome/browser/printing/print_job_worker.cc
@@ -22,7 +22,6 @@
@ -102,7 +102,7 @@ index 47a5b3c2a11ec595ff926df10f856ed3c5375c55..38769ab454b143a1f50d1291a363092c
 }
 
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 81df8a2cb0c374c6a93520fdd3c1951752b3c1f3..cad3c7ab1f7182f596484fe29ad8a60d5f953a78 100644
+index 9aa99b764ad8620ca82c511ac22a981141cdf15c..3b6e1d2609af952fa825688833387518cafdb352 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
@@ -28,10 +28,10 @@
@ -129,16 +129,16 @@ index 81df8a2cb0c374c6a93520fdd3c1951752b3c1f3..cad3c7ab1f7182f596484fe29ad8a60d
@@ -75,6 +76,8 @@ using PrintSettingsCallback =
     base::OnceCallback<void(std::unique_ptr<PrinterQuery>)>;
 
- void ShowWarningMessageBox(const base::string16& message) {
+ void ShowWarningMessageBox(const std::u16string& message) {
 +  LOG(ERROR) << "Invalid printer settings " << message;
 +#if 0
   // Runs always on the UI thread.
   static bool is_dialog_shown = false;
   if (is_dialog_shown)
-@@ -83,6 +86,7 @@ void ShowWarningMessageBox(const base::string16& message) {
+@@ -83,6 +86,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
   base::AutoReset<bool> auto_reset(&is_dialog_shown, true);
 
-   chrome::ShowWarningMessageBox(nullptr, base::string16(), message);
+   chrome::ShowWarningMessageBox(nullptr, std::u16string(), message);
 +#endif
 }
 
@ -154,7 +154,7 @@ index 81df8a2cb0c374c6a93520fdd3c1951752b3c1f3..cad3c7ab1f7182f596484fe29ad8a60d
     RenderParamsFromPrintSettings(printer_query->settings(),
                                   params->params.get());
     params->params->document_cookie = printer_query->cookie();
-@@ -348,12 +354,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
+@@ -345,12 +351,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
     : PrintManager(web_contents),
       queue_(g_browser_process->print_job_manager()->queue()) {
   DCHECK(queue_);
@ -169,7 +169,7 @@ index 81df8a2cb0c374c6a93520fdd3c1951752b3c1f3..cad3c7ab1f7182f596484fe29ad8a60d
 }
 
 PrintViewManagerBase::~PrintViewManagerBase() {
-@@ -361,7 +369,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
+@@ -358,7 +366,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
   DisconnectFromCurrentPrintJob();
 }
 
@ -181,7 +181,7 @@ index 81df8a2cb0c374c6a93520fdd3c1951752b3c1f3..cad3c7ab1f7182f596484fe29ad8a60d
   DisconnectFromCurrentPrintJob();
 
   // Don't print / print preview crashed tabs.
-@@ -369,7 +380,14 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
+@@ -366,7 +377,14 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
     return false;
 
   SetPrintingRFH(rfh);
@ -197,7 +197,7 @@ index 81df8a2cb0c374c6a93520fdd3c1951752b3c1f3..cad3c7ab1f7182f596484fe29ad8a60d
   return true;
 }
 
-@@ -490,9 +508,9 @@ void PrintViewManagerBase::StartLocalPrintJob(
+@@ -487,9 +505,9 @@ void PrintViewManagerBase::StartLocalPrintJob(
 void PrintViewManagerBase::UpdatePrintingEnabled() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   // The Unretained() is safe because ForEachFrame() is synchronous.
@ -210,7 +210,7 @@ index 81df8a2cb0c374c6a93520fdd3c1951752b3c1f3..cad3c7ab1f7182f596484fe29ad8a60d
 }
 
 void PrintViewManagerBase::NavigationStopped() {
-@@ -609,12 +627,13 @@ void PrintViewManagerBase::DidPrintDocument(
+@@ -606,12 +624,13 @@ void PrintViewManagerBase::DidPrintDocument(
 void PrintViewManagerBase::GetDefaultPrintSettings(
     GetDefaultPrintSettingsCallback callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@ -225,7 +225,7 @@ index 81df8a2cb0c374c6a93520fdd3c1951752b3c1f3..cad3c7ab1f7182f596484fe29ad8a60d
   content::RenderFrameHost* render_frame_host =
       print_manager_host_receivers_.GetCurrentTargetFrame();
 
-@@ -630,11 +649,12 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -627,11 +646,12 @@ void PrintViewManagerBase::UpdatePrintSettings(
     base::Value job_settings,
     UpdatePrintSettingsCallback callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@ -239,7 +239,7 @@ index 81df8a2cb0c374c6a93520fdd3c1951752b3c1f3..cad3c7ab1f7182f596484fe29ad8a60d
   if (!job_settings.FindIntKey(kSettingPrinterType)) {
     UpdatePrintSettingsReply(std::move(callback), nullptr, false);
     return;
-@@ -673,7 +693,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
+@@ -665,7 +685,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
   PrintManager::PrintingFailed(cookie);
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
@ -248,7 +248,7 @@ index 81df8a2cb0c374c6a93520fdd3c1951752b3c1f3..cad3c7ab1f7182f596484fe29ad8a60d
 #endif
 
   ReleasePrinterQuery();
-@@ -685,6 +705,11 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
+@@ -677,6 +697,11 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
 }
 
 void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
@ -260,7 +260,7 @@ index 81df8a2cb0c374c6a93520fdd3c1951752b3c1f3..cad3c7ab1f7182f596484fe29ad8a60d
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
                                 l10n_util::GetStringUTF16(
-@@ -754,9 +779,13 @@ void PrintViewManagerBase::OnNotifyPrintJobEvent(
+@@ -746,9 +771,13 @@ void PrintViewManagerBase::OnNotifyPrintJobEvent(
           content::NotificationService::NoDetails());
       break;
     }
@ -276,7 +276,7 @@ index 81df8a2cb0c374c6a93520fdd3c1951752b3c1f3..cad3c7ab1f7182f596484fe29ad8a60d
       NOTREACHED();
       break;
     }
-@@ -854,8 +883,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -846,8 +875,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
   DCHECK(!quit_inner_loop_);
   DCHECK(query);
 
@ -289,7 +289,7 @@ index 81df8a2cb0c374c6a93520fdd3c1951752b3c1f3..cad3c7ab1f7182f596484fe29ad8a60d
 
   // We can't print if there is no renderer.
   if (!web_contents()->GetMainFrame()->GetRenderViewHost() ||
-@@ -876,8 +907,6 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -868,8 +899,6 @@ bool PrintViewManagerBase::CreateNewPrintJob(
                         /*source_id=*/"");
 #endif
 
@ -298,7 +298,7 @@ index 81df8a2cb0c374c6a93520fdd3c1951752b3c1f3..cad3c7ab1f7182f596484fe29ad8a60d
   printing_succeeded_ = false;
   return true;
 }
-@@ -926,14 +955,22 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -918,14 +947,22 @@ void PrintViewManagerBase::ReleasePrintJob() {
   content::RenderFrameHost* rfh = printing_rfh_;
   printing_rfh_ = nullptr;
 
@ -323,7 +323,7 @@ index 81df8a2cb0c374c6a93520fdd3c1951752b3c1f3..cad3c7ab1f7182f596484fe29ad8a60d
   // Don't close the worker thread.
   print_job_ = nullptr;
 }
-@@ -969,7 +1006,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
+@@ -961,7 +998,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
 }
 
 bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@ -333,10 +333,10 @@ index 81df8a2cb0c374c6a93520fdd3c1951752b3c1f3..cad3c7ab1f7182f596484fe29ad8a60d
 
   if (!cookie) {
 diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
-index 93103940036ece118c511703c20c659d73724202..fcbf4c69d1b6cd30124444158e3f2c6da3371977 100644
+index 17d25f0008699ce41158424a9d266d22952ab631..d22f7f8c16ffbc90db57004f7fb09aab7034e2bf 100644
 --- a/chrome/browser/printing/print_view_manager_base.h
 +++ b/chrome/browser/printing/print_view_manager_base.h
-@@ -38,6 +38,8 @@ class PrintJob;
+@@ -39,6 +39,8 @@ class PrintJob;
 class PrintQueriesQueue;
 class PrinterQuery;
 
@ -345,7 +345,7 @@ index 93103940036ece118c511703c20c659d73724202..fcbf4c69d1b6cd30124444158e3f2c6d
 // Base class for managing the print commands for a WebContents.
 class PrintViewManagerBase : public content::NotificationObserver,
                              public PrintManager {
-@@ -47,7 +49,10 @@ class PrintViewManagerBase : public content::NotificationObserver,
+@@ -48,7 +50,10 @@ class PrintViewManagerBase : public content::NotificationObserver,
   // Prints the current document immediately. Since the rendering is
   // asynchronous, the actual printing will not be completed on the return of
   // this function. Returns false if printing is impossible at the moment.
@ -357,7 +357,7 @@ index 93103940036ece118c511703c20c659d73724202..fcbf4c69d1b6cd30124444158e3f2c6d
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
   // Prints the document in |print_data| with settings specified in
-@@ -214,9 +219,15 @@ class PrintViewManagerBase : public content::NotificationObserver,
+@@ -215,9 +220,15 @@ class PrintViewManagerBase : public content::NotificationObserver,
   // The current RFH that is printing with a system printing dialog.
   content::RenderFrameHost* printing_rfh_ = nullptr;
 
@ -387,7 +387,7 @@ index 4fde003f2a12794bfcd479ef2797cc6281c5720b..bc3bc4aee26f9373de35366ddb07f7ba
   // Tells the RenderFrame to switch the CSS to print media type, render every
   // requested page using the print preview document's frame/node, and then
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index 74ae09e7fb99a029b81e5a62f935d6483e6fdd62..3c4ad1139658b46d78f47b3e0445b52bfac943dd 100644
+index 54e6f97423fc08772cc3505e82fb8640178d41b0..c66aa6faaefad9b7d3b5371b5280356989da5e97 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
@@ -38,6 +38,7 @@
@ -398,7 +398,7 @@ index 74ae09e7fb99a029b81e5a62f935d6483e6fdd62..3c4ad1139658b46d78f47b3e0445b52b
 #include "printing/units.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
-@@ -1166,7 +1167,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
+@@ -1165,7 +1166,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
     if (!weak_this)
       return;
 
@ -408,7 +408,7 @@ index 74ae09e7fb99a029b81e5a62f935d6483e6fdd62..3c4ad1139658b46d78f47b3e0445b52b
 
     if (weak_this)
       web_frame->DispatchAfterPrintEvent();
-@@ -1194,7 +1196,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
+@@ -1193,7 +1195,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
   receivers_.Add(this, std::move(receiver));
 }
 
@ -417,7 +417,7 @@ index 74ae09e7fb99a029b81e5a62f935d6483e6fdd62..3c4ad1139658b46d78f47b3e0445b52b
   ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
   if (ipc_nesting_level_ > 1)
     return;
-@@ -1209,7 +1211,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
+@@ -1208,7 +1210,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
   // that instead.
   auto plugin = delegate_->GetPdfElement(frame);
 
@ -426,7 +426,7 @@ index 74ae09e7fb99a029b81e5a62f935d6483e6fdd62..3c4ad1139658b46d78f47b3e0445b52b
 
   if (!render_frame_gone_)
     frame->DispatchAfterPrintEvent();
-@@ -1228,7 +1230,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
+@@ -1227,7 +1229,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
   }
 
   Print(frame, print_preview_context_.source_node(),
@ -436,7 +436,7 @@ index 74ae09e7fb99a029b81e5a62f935d6483e6fdd62..3c4ad1139658b46d78f47b3e0445b52b
   if (!render_frame_gone_)
     print_preview_context_.DispatchAfterPrintEvent();
   // WARNING: |this| may be gone at this point. Do not do any more work here and
-@@ -1276,6 +1279,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
+@@ -1275,6 +1278,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
   if (ipc_nesting_level_ > 1)
     return;
 
@ -548,7 +548,7 @@ index 74ae09e7fb99a029b81e5a62f935d6483e6fdd62..3c4ad1139658b46d78f47b3e0445b52b
     notify_browser_of_print_failure_ = false;
     GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
     return false;
-@@ -2475,18 +2520,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type) {
+@@ -2486,18 +2531,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type) {
 }
 
 bool PrintRenderFrameHelper::CheckForCancel() {
@ -622,7 +622,7 @@ index 92561ff7c6bce6febd8cd2f39f59e3df707f8bdb..241686fa8bdc346f073b5fb92f57c72c
     std::unique_ptr<PrintSettings> settings =
         PrintSettingsFromJobSettings(job_settings);
 diff --git a/printing/printing_context.h b/printing/printing_context.h
-index 268e03d2b8d4f1c81f6ebe81b44ffa6252f88c4b..1baef8c1d58becf760b1576a2d541810a2f98555 100644
+index de7861c6c620f573c72f4bd5fd877b4e919dd97d..337dcddcf611fcf0238de26c4981c8e34d3f6eeb 100644
 --- a/printing/printing_context.h
 +++ b/printing/printing_context.h
@@ -134,12 +134,12 @@ class PRINTING_EXPORT PrintingContext {
--- a/patches/chromium/put_back_deleted_colors_for_autofill.patch
+++ b/patches/chromium/put_back_deleted_colors_for_autofill.patch
@ -8,10 +8,10 @@ needed in chromium but our autofill implementation uses them.  This patch can be
 our autofill implementation to work like Chromium's.

 diff --git a/ui/gtk/native_theme_gtk.cc b/ui/gtk/native_theme_gtk.cc
-index cc8966c3cb5d81f337932d45d89ca51047224116..e1fea89d33f7362b50aa8da04a622becf60660ff 100644
+index 5882e183ffd353890c367e3ff44937bb6226ff84..3f1b45f5b2e54ffaf1e47e93389b4a945867523f 100644
 --- a/ui/gtk/native_theme_gtk.cc
 +++ b/ui/gtk/native_theme_gtk.cc
-@@ -362,6 +362,29 @@ base::Optional<SkColor> SkColorFromColorId(
+@@ -364,6 +364,29 @@ base::Optional<SkColor> SkColorFromColorId(
     case ui::NativeTheme::kColorId_TableHeaderSeparator:
       return GetBorderColor("GtkTreeView#treeview.view GtkButton#button");
 
@ -42,7 +42,7 @@ index cc8966c3cb5d81f337932d45d89ca51047224116..e1fea89d33f7362b50aa8da04a622bec
     // TODO(thomasanderson): Render GtkSpinner directly.
     case ui::NativeTheme::kColorId_ThrobberSpinningColor:
 diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc
-index a585d34fdb68c39f8f663de6c497359d7f0abfd0..34bc98d26cbfec2cd62d3bf89417c077ce828f06 100644
+index 082e12fcabd16d3db77ee9c5e47f7e383245aa45..fc1d7a814c52fa09bea550039763b1c83fffc530 100644
 --- a/ui/native_theme/common_theme.cc
 +++ b/ui/native_theme/common_theme.cc
@@ -52,7 +52,8 @@ base::Optional<SkColor> GetHighContrastColor(
@ -70,7 +70,7 @@ index a585d34fdb68c39f8f663de6c497359d7f0abfd0..34bc98d26cbfec2cd62d3bf89417c077
     // Button
     case NativeTheme::kColorId_ProminentButtonColor:
       return gfx::kGoogleBlue300;
-@@ -511,6 +520,18 @@ SkColor GetDefaultColor(NativeTheme::ColorId color_id,
+@@ -512,6 +521,18 @@ SkColor GetDefaultColor(NativeTheme::ColorId color_id,
     case NativeTheme::kColorId_WindowBackground:
       return SK_ColorWHITE;
 
@ -89,7 +89,7 @@ index a585d34fdb68c39f8f663de6c497359d7f0abfd0..34bc98d26cbfec2cd62d3bf89417c077
     case NativeTheme::kColorId_NumColors:
       // Keeping the kColorId_NumColors case instead of using the default case
       // allows ColorId additions to trigger compile error for an incomplete
-@@ -555,7 +576,7 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
+@@ -556,7 +577,7 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
   }
 
   if (color_scheme == NativeTheme::ColorScheme::kDark) {
@ -99,10 +99,10 @@ index a585d34fdb68c39f8f663de6c497359d7f0abfd0..34bc98d26cbfec2cd62d3bf89417c077
       DVLOG(2) << "GetDarkSchemeColor: "
                << "NativeTheme::ColorId: " << NativeThemeColorIdName(color_id)
 diff --git a/ui/native_theme/native_theme_color_id.h b/ui/native_theme/native_theme_color_id.h
-index 8f89aa16c66d4447a8e91bb95eb76f4bde024224..495b345d06de2e10ae14cff7c4af2d85563e80f8 100644
+index efb0f8658db38b99aadb92334b4c0948d289d224..a424ceaef8979084ca7dd514849a38dfe9e5b252 100644
 --- a/ui/native_theme/native_theme_color_id.h
 +++ b/ui/native_theme/native_theme_color_id.h
-@@ -147,6 +147,11 @@
+@@ -146,6 +146,11 @@
   OP(kColorId_TableHeaderText),                                                \
   OP(kColorId_TableHeaderBackground),                                          \
   OP(kColorId_TableHeaderSeparator),                                           \
@ -115,10 +115,10 @@ index 8f89aa16c66d4447a8e91bb95eb76f4bde024224..495b345d06de2e10ae14cff7c4af2d85
   OP(kColorId_ThrobberSpinningColor),                                          \
   OP(kColorId_ThrobberWaitingColor),                                           \
 diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
-index 0726b178dc73dcb0728510486d07b46df464ace9..e3962d04553dcdf27bbb878f39a47e279dc4959f 100644
+index 46eab8ff45a3bb874cd8b16076dd9fa918ffbd45..90e3b67bd5c78be3ea0d0f0e4ef94bc95ea375a2 100644
 --- a/ui/native_theme/native_theme_win.cc
 +++ b/ui/native_theme/native_theme_win.cc
-@@ -651,6 +651,18 @@ base::Optional<SkColor> NativeThemeWin::GetPlatformHighContrastColor(
+@@ -659,6 +659,18 @@ base::Optional<SkColor> NativeThemeWin::GetPlatformHighContrastColor(
     case kColorId_ThrobberWaitingColor:
       return system_colors_[SystemThemeColor::kGrayText];
 
--- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
+++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
@ -8,7 +8,7 @@ Chrome moved the SetCursor IPC message to mojo, which we use to tell OSR about `
 Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2172779

 diff --git a/content/browser/renderer_host/render_widget_host_delegate.h b/content/browser/renderer_host/render_widget_host_delegate.h
-index e3fe7f35ddad36765bda4e38042ce77b58f37b3f..e5e45826022f65d57eccb2a0049344395303a019 100644
+index 4a60eef424879cf96003bc2522887dc8c7630254..51bcc78ecd8f5f40e90a5e9077ac59b37c5c3e13 100644
 --- a/content/browser/renderer_host/render_widget_host_delegate.h
 +++ b/content/browser/renderer_host/render_widget_host_delegate.h
@@ -14,6 +14,7 @@
@ -30,7 +30,7 @@ index e3fe7f35ddad36765bda4e38042ce77b58f37b3f..e5e45826022f65d57eccb2a004934439
   // RenderWidgetHost on the main frame, and false otherwise.
   virtual bool IsWidgetForMainFrame(RenderWidgetHostImpl*);
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index c4db072350e60db8323e9d275a28222ac9d18b3e..ff38837491c6668ea87ea3dc4dee89f3e4de6cb5 100644
+index d98336a4b552290aff88a0c14321a58807c7eb05..fd3eac0706be719433257c218abe5402863726fc 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1902,6 +1902,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
@ -43,10 +43,10 @@ index c4db072350e60db8323e9d275a28222ac9d18b3e..ff38837491c6668ea87ea3dc4dee89f3
 
 void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index c36d614a237077e5dedb4450ec51316b0fd2a990..6a044db477fc5b20e3ab6e14fda3c21162d112cb 100644
+index 703f847c844fda3b9efbbd7ce28743c5a9d991a4..cd90a347277d1375251e4e4b9025ca1726010324 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4170,6 +4170,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
+@@ -4188,6 +4188,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
   return text_input_manager_.get();
 }
 
@ -59,10 +59,10 @@ index c36d614a237077e5dedb4450ec51316b0fd2a990..6a044db477fc5b20e3ab6e14fda3c211
     RenderWidgetHostImpl* render_widget_host) {
   return render_widget_host == GetMainFrame()->GetRenderWidgetHost();
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 90feb1f15ba6f1a6367fe50113d44b435f56bd13..eed7f31c0f4212f33598334948dd997ac1142a67 100644
+index 1f383dfb0302fcbf0220c6a4cd8890660b1131a9..cf4bfa28fbd48a655bfe3233155dd7bfd20c898b 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -961,6 +961,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+@@ -960,6 +960,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
       blink::mojom::FrameVisibility visibility) override;
   void SendScreenRects() override;
   TextInputManager* GetTextInputManager() override;
@ -71,7 +71,7 @@ index 90feb1f15ba6f1a6367fe50113d44b435f56bd13..eed7f31c0f4212f33598334948dd997a
   bool IsShowingContextMenuOnPage() const override;
   void DidChangeScreenOrientation() override;
 diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
-index 69654654f5e59631b15a8c45fb76977f217356d6..d70af96206f89a9939a2d06efccca625ad0cb9ef 100644
+index ada26a7d33b79596cc161aa3a73e3698bd76de81..a65f15f0f5788faf44213d484989a2cb112b1e30 100644
 --- a/content/public/browser/web_contents_observer.h
 +++ b/content/public/browser/web_contents_observer.h
@@ -14,6 +14,7 @@
@ -82,7 +82,7 @@ index 69654654f5e59631b15a8c45fb76977f217356d6..d70af96206f89a9939a2d06efccca625
 #include "content/public/browser/allow_service_worker_result.h"
 #include "content/public/browser/cookie_access_details.h"
 #include "content/public/browser/navigation_controller.h"
-@@ -363,6 +364,9 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
+@@ -369,6 +370,9 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
   // Invoked every time the WebContents changes visibility.
   virtual void OnVisibilityChanged(Visibility visibility) {}
 
--- a/patches/chromium/render_widget_host_view_base.patch
+++ b/patches/chromium/render_widget_host_view_base.patch
@ -6,7 +6,7 @@ Subject: render_widget_host_view_base.patch
 ... something to do with OSR? and maybe <webview> as well? terrifying.

 diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
-index da0698caa0767c5b232821cebe9d6a9df05450e3..335d432e5cb38e5e3eddbccb8fd048d65b02d499 100644
+index fd202aae99a908a6dc7be45ed620b6a77cba6af8..97d28c588a4779141215f768c0b36960c7f19c8e 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -577,6 +577,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
@ -24,10 +24,10 @@ index da0698caa0767c5b232821cebe9d6a9df05450e3..335d432e5cb38e5e3eddbccb8fd048d6
     const blink::WebMouseEvent& event,
     const ui::LatencyInfo& latency) {
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
-index 7fd61deee01936024a541f4894d24d5c99fed340..d274fcb2f96a4589c7e641cd0acf8c82209c19a3 100644
+index 868c503052ce7f144da067f98b5b06ea98aa541a..9c57e660cfed6922479ea647ea43c7745bd6bec8 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.h
 +++ b/content/browser/renderer_host/render_widget_host_view_base.h
-@@ -25,8 +25,10 @@
+@@ -26,8 +26,10 @@
 #include "components/viz/host/hit_test/hit_test_query.h"
 #include "content/browser/renderer_host/display_feature.h"
 #include "content/browser/renderer_host/event_with_latency_info.h"
@ -38,7 +38,7 @@ index 7fd61deee01936024a541f4894d24d5c99fed340..d274fcb2f96a4589c7e641cd0acf8c82
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/visibility.h"
 #include "content/public/common/widget_type.h"
-@@ -65,9 +67,11 @@ class CursorManager;
+@@ -66,9 +68,11 @@ class CursorManager;
 class MouseWheelPhaseHandler;
 class RenderWidgetHostImpl;
 class RenderWidgetHostViewBaseObserver;
@ -50,7 +50,7 @@ index 7fd61deee01936024a541f4894d24d5c99fed340..d274fcb2f96a4589c7e641cd0acf8c82
 class WebCursor;
 class WebContentsAccessibility;
 class DelegatedFrameHost;
-@@ -123,6 +127,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -124,6 +128,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
       bool show_reason_unoccluded,
       bool show_reason_bfcache_restore) final;
 
@ -60,7 +60,7 @@ index 7fd61deee01936024a541f4894d24d5c99fed340..d274fcb2f96a4589c7e641cd0acf8c82
   // This only needs to be overridden by RenderWidgetHostViewBase subclasses
   // that handle content embedded within other RenderWidgetHostViews.
   gfx::PointF TransformPointToRootCoordSpaceF(
-@@ -282,6 +289,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -283,6 +290,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
   virtual void ProcessGestureEvent(const blink::WebGestureEvent& event,
                                    const ui::LatencyInfo& latency);
 
--- a/patches/chromium/render_widget_host_view_mac.patch
+++ b/patches/chromium/render_widget_host_view_mac.patch
@ -10,7 +10,7 @@ kinds of utility windows. Similarly for `disableAutoHideCursor`.
 Additionally, disables usage of some private APIs in MAS builds.

 diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-index 867eebe26002856bcdc1fcb33ef2619603adbb62..7255671200d83ae4438bed28dbb8eae558b94b47 100644
+index cb8d2b79fd15c0178feedc6e4be1c5150d8e5d47..62f536126e6fd4335072172fa58dcf71837b4b98 100644
 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
@@ -153,6 +153,15 @@ void ExtractUnderlines(NSAttributedString* string,
--- a/patches/chromium/resource_file_conflict.patch
+++ b/patches/chromium/resource_file_conflict.patch
@ -52,10 +52,10 @@ Some alternatives to this patch:
 None of these options seems like a substantial maintainability win over this patch to me (@nornagon).

 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 6f386508b11746fb9d313b51642e3450bfdf2ef5..247c6bc34f6405c4b186c93387c2731b149d243c 100644
+index f80853980d0d72fa843f3109593e3c4fadbfb65f..a76a56e19ce8450e1965aebe505d8f537a493b56 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1423,7 +1423,7 @@ if (is_chrome_branded && !is_android) {
+@@ -1499,7 +1499,7 @@ if (is_chrome_branded && !is_android) {
   }
 }
 
@ -64,7 +64,7 @@ index 6f386508b11746fb9d313b51642e3450bfdf2ef5..247c6bc34f6405c4b186c93387c2731b
   chrome_paks("packed_resources") {
     if (is_mac) {
       output_dir = "$root_gen_dir/repack"
-@@ -1443,6 +1443,12 @@ if (!is_android) {
+@@ -1519,6 +1519,12 @@ if (!is_android) {
   }
 }
 
--- a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch
+++ b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch
@ -9,10 +9,10 @@ for every navigation to keep Node.js working properly. Once Native Modules in th
 are required to be NAPI or context aware (Electron v11), this patch can be removed.

 diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
-index ab0472c9eda27bcccdceab2486f878b2e48c86cf..420e7452f4f3c8a9c266e0a767c75fd866506bc4 100644
+index 08dda0d5779cefcc0aa2d7d691d8f84137975b5e..d3439ac00ea7e58c2eee210831d38bb8745468cc 100644
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -1267,6 +1267,25 @@ ChromeContentRendererClient::GetProtocolHandlerSecurityLevel() {
+@@ -1282,6 +1282,25 @@ ChromeContentRendererClient::GetProtocolHandlerSecurityLevel() {
 #endif
 }
 
@ -39,7 +39,7 @@ index ab0472c9eda27bcccdceab2486f878b2e48c86cf..420e7452f4f3c8a9c266e0a767c75fd8
     WebLocalFrame* frame,
     ui::PageTransition transition_type,
 diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
-index 0c5a146410ef9519f587714d52fedea951e91d14..59909a250f0062b5b937625a5ba96079bacb3e74 100644
+index 0340221d15b589505065c287012a9aa8367d7301..e68ca8f3978a339e4deef2d91794b139e20c6907 100644
 --- a/chrome/renderer/chrome_content_renderer_client.h
 +++ b/chrome/renderer/chrome_content_renderer_client.h
@@ -122,6 +122,11 @@ class ChromeContentRendererClient
@ -55,7 +55,7 @@ index 0c5a146410ef9519f587714d52fedea951e91d14..59909a250f0062b5b937625a5ba96079
       override;
   void WillSendRequest(blink::WebLocalFrame* frame,
 diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc
-index 2023cec6ef2d9d90dfe2b68caec2c350d0212490..53587c613aa1c4d6401f056b393dda3c84fe9559 100644
+index 9745f3208baaf1654c8386c11067958c0e47fd28..8ebebd91eb1216d5ccb4dd31dad0b9772053f2f1 100644
 --- a/content/public/renderer/content_renderer_client.cc
 +++ b/content/public/renderer/content_renderer_client.cc
@@ -117,6 +117,14 @@ bool ContentRendererClient::HandleNavigation(
@ -74,7 +74,7 @@ index 2023cec6ef2d9d90dfe2b68caec2c350d0212490..53587c613aa1c4d6401f056b393dda3c
     blink::WebLocalFrame* frame,
     ui::PageTransition transition_type,
 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
-index ff1d4178b3c1e477730c5103b8907bc5d01dd9fe..9888848f113b54cde1d0a004f8f5ea6984721b83 100644
+index 04ef16a04e8597d49e1730b9ea11191e350d63d1..5735c09a753c5aaffe4bb75efe2a5bb7b0672ed6 100644
 --- a/content/public/renderer/content_renderer_client.h
 +++ b/content/public/renderer/content_renderer_client.h
@@ -208,6 +208,13 @@ class CONTENT_EXPORT ContentRendererClient {
@ -92,10 +92,10 @@ index ff1d4178b3c1e477730c5103b8907bc5d01dd9fe..9888848f113b54cde1d0a004f8f5ea69
   // |url|. If the function returns a valid |new_url|, the request must be
   // updated to use it.
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index adac4b9b2b73be64495dbbb858af5402523bb59b..d497f3aac9bee9d5738bc50b5650dc2142870e2a 100644
+index 2d6f936ade9cb1baceeea038df48e92f4ab3783a..43e20435b41c2d682a361ff4f0681081bcf4eab0 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -5307,6 +5307,23 @@ void RenderFrameImpl::BeginNavigation(
+@@ -5347,6 +5347,23 @@ void RenderFrameImpl::BeginNavigation(
     // we can do a per-frame check here rather than a process-wide check.
     bool should_fork = HasWebUIScheme(url) || HasWebUIScheme(old_url) ||
                        (enabled_bindings_ & kWebUIBindingsPolicyMask);
--- a/patches/chromium/scroll_bounce_flag.patch
+++ b/patches/chromium/scroll_bounce_flag.patch
@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
 Patch to make scrollBounce option work.

 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index b2d116b6b12862fa0e4003e9bbd121f39ac63042..e2906b7be45bbda0875b360112621ffcf6d66c60 100644
+index 33e17936aa5410cf4074d19593949798db90d40e..47b32784f4299595891c35234045cb3d4939039f 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1245,7 +1245,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
+@@ -1268,7 +1268,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
 }
 
 bool RenderThreadImpl::IsElasticOverscrollEnabled() {
--- a/patches/chromium/ssl_security_state_tab_helper.patch
+++ b/patches/chromium/ssl_security_state_tab_helper.patch
@ -6,7 +6,7 @@ Subject: ssl_security_state_tab_helper.patch
 Allows populating security tab info for devtools in Electron.

 diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc
-index e85187fe0e087e8e6f5552bd63be1720d27ed59f..ac7009506c4a173f0a7c4717b6eb3fadbfeeb797 100644
+index 810fdd18c25a3d3abf13b163e8e63b201d3736e9..0c678efd12694b2f5bd3969f9ad7d1adf4ef4a72 100644
 --- a/chrome/browser/ssl/security_state_tab_helper.cc
 +++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -7,6 +7,7 @@
@ -56,23 +56,7 @@ index e85187fe0e087e8e6f5552bd63be1720d27ed59f..ac7009506c4a173f0a7c4717b6eb3fad
 #include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
 #endif
 
-@@ -98,9 +103,12 @@ bool IsLegacyTLS(GURL url, int connection_status) {
-   // default we treat TLS < 1.2 as Legacy, unless the "SSLVersionMin" policy is
-   // set.
-   std::string ssl_version_min_str = switches::kSSLVersionTLSv12;
-  PrefService* local_state = g_browser_process->local_state();
-  if (local_state && local_state->HasPrefPath(prefs::kSSLVersionMin)) {
-    ssl_version_min_str = local_state->GetString(prefs::kSSLVersionMin);
-+
-+  // Read directly from the command line, since our pref store is not the same
-+  // as Chrome's.
-+  auto* cmd_line = base::CommandLine::ForCurrentProcess();
-+  if (cmd_line->HasSwitch(::switches::kSSLVersionMin)) {
-+    ssl_version_min_str = cmd_line->GetSwitchValueASCII(::switches::kSSLVersionMin);
-   }
- 
-   // Convert the pref string to an SSLVersion, if it is valid. Otherwise use the
-@@ -120,8 +128,9 @@ bool IsLegacyTLS(GURL url, int connection_status) {
+@@ -76,8 +81,9 @@ void RecordSecurityLevel(
 
 }  // namespace
 
@ -83,7 +67,7 @@ index e85187fe0e087e8e6f5552bd63be1720d27ed59f..ac7009506c4a173f0a7c4717b6eb3fad
 
 SecurityStateTabHelper::SecurityStateTabHelper(
     content::WebContents* web_contents)
-@@ -150,6 +159,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() {
+@@ -101,6 +107,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() {
   // information is still being initialized, thus no need to check for that.
   state->malicious_content_status = GetMaliciousContentStatus();
 
@ -91,7 +75,7 @@ index e85187fe0e087e8e6f5552bd63be1720d27ed59f..ac7009506c4a173f0a7c4717b6eb3fad
   ReputationWebContentsObserver* reputation_web_contents_observer =
       ReputationWebContentsObserver::FromWebContents(web_contents());
   state->safety_tip_info =
-@@ -174,6 +184,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() {
+@@ -125,6 +132,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() {
     }
   }
 
@ -99,7 +83,7 @@ index e85187fe0e087e8e6f5552bd63be1720d27ed59f..ac7009506c4a173f0a7c4717b6eb3fad
   return state;
 }
 
-@@ -236,8 +247,10 @@ void SecurityStateTabHelper::DidFinishNavigation(
+@@ -184,8 +192,10 @@ void SecurityStateTabHelper::DidFinishNavigation(
     UMA_HISTOGRAM_BOOLEAN("interstitial.ssl.visited_site_after_warning", true);
   }
 
@ -110,7 +94,7 @@ index e85187fe0e087e8e6f5552bd63be1720d27ed59f..ac7009506c4a173f0a7c4717b6eb3fad
 }
 
 void SecurityStateTabHelper::DidChangeVisibleSecurityState() {
-@@ -261,6 +274,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
+@@ -209,6 +219,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
       web_contents()->GetController().GetVisibleEntry();
   if (!entry)
     return security_state::MALICIOUS_CONTENT_STATUS_NONE;
@ -118,7 +102,7 @@ index e85187fe0e087e8e6f5552bd63be1720d27ed59f..ac7009506c4a173f0a7c4717b6eb3fad
   safe_browsing::SafeBrowsingService* sb_service =
       g_browser_process->safe_browsing_service();
   if (!sb_service)
-@@ -343,6 +357,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
+@@ -291,6 +302,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
         break;
     }
   }
--- a/patches/chromium/support_mixed_sandbox_with_zygote.patch
+++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch
@ -22,12 +22,12 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.

 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 5e67fd252d6ce17d8093b81d89dec32756a8ba3b..1b93f610a23c1e1c1ec5a90bfcc9958ec06aad65 100644
+index bb60223620f6aab8d48db90ddc9f8b511834f692..24c3f7991246985947e567d90779ecb9416c8686 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -400,6 +400,11 @@ class RendererSandboxedProcessLauncherDelegate
-   {
-   }
+@@ -392,10 +392,18 @@ class RendererSandboxedProcessLauncherDelegate
+  public:
+   RendererSandboxedProcessLauncherDelegate() = default;
 
 +#if BUILDFLAG(USE_ZYGOTE_HANDLE)
 +  RendererSandboxedProcessLauncherDelegate(bool use_zygote):
@ -36,9 +36,6 @@ index 5e67fd252d6ce17d8093b81d89dec32756a8ba3b..1b93f610a23c1e1c1ec5a90bfcc9958e
 +
   ~RendererSandboxedProcessLauncherDelegate() override = default;
 
- #if defined(OS_WIN)
-@@ -428,6 +433,9 @@ class RendererSandboxedProcessLauncherDelegate
- 
 #if BUILDFLAG(USE_ZYGOTE_HANDLE)
   ZygoteHandle GetZygote() override {
 +    if (!use_zygote_) {
@ -47,38 +44,41 @@ index 5e67fd252d6ce17d8093b81d89dec32756a8ba3b..1b93f610a23c1e1c1ec5a90bfcc9958e
     const base::CommandLine& browser_command_line =
         *base::CommandLine::ForCurrentProcess();
     base::CommandLine::StringType renderer_prefix =
-@@ -446,10 +454,13 @@ class RendererSandboxedProcessLauncherDelegate
+@@ -413,6 +421,11 @@ class RendererSandboxedProcessLauncherDelegate
+   sandbox::policy::SandboxType GetSandboxType() override {
     return sandbox::policy::SandboxType::kRenderer;
   }
- 
-#if defined(OS_WIN)
-  private:
-+#if defined(OS_WIN)
-   const bool renderer_code_integrity_enabled_;
- #endif
+
+ private:
 +#if BUILDFLAG(USE_ZYGOTE_HANDLE)
 +  bool use_zygote_ = true;
 +#endif
 };
 
- const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey";
-@@ -1908,11 +1919,18 @@ bool RenderProcessHostImpl::Init() {
-       cmd_line->PrependWrapper(renderer_prefix);
-     AppendRendererCommandLine(cmd_line.get());
- 
+ #if defined(OS_WIN)
+@@ -423,6 +436,9 @@ class RendererSandboxedProcessLauncherDelegateWin
+   RendererSandboxedProcessLauncherDelegateWin(base::CommandLine* cmd_line)
+       : renderer_code_integrity_enabled_(
+             GetContentClient()->browser()->IsRendererCodeIntegrityEnabled()) {
+#if BUILDFLAG(USE_ZYGOTE_HANDLE)
+    use_zygote_ = !cmd_line->HasSwitch(switches::kNoZygote);
+#endif
+     if (cmd_line->HasSwitch(switches::kJavaScriptFlags)) {
+       std::string js_flags =
+           cmd_line->GetSwitchValueASCII(switches::kJavaScriptFlags);
+@@ -1832,9 +1848,15 @@ bool RenderProcessHostImpl::Init() {
+     std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
+         std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
+             cmd_line.get());
+#else
 +#if BUILDFLAG(USE_ZYGOTE_HANDLE)
 +    bool use_zygote = !cmd_line->HasSwitch(switches::kNoZygote);
-+    auto delegate = std::make_unique<RendererSandboxedProcessLauncherDelegate>(use_zygote);
-+#else
-+    auto delegate = std::make_unique<RendererSandboxedProcessLauncherDelegate>();
+    std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
+        std::make_unique<RendererSandboxedProcessLauncherDelegate>(use_zygote);
+ #else
+     std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
+         std::make_unique<RendererSandboxedProcessLauncherDelegate>();
 +#endif
-+
+ #endif
     // Spawn the child process asynchronously to avoid blocking the UI thread.
     // As long as there's no renderer prefix, we can use the zygote process
-     // at this stage.
-     child_process_launcher_ = std::make_unique<ChildProcessLauncher>(
-        std::make_unique<RendererSandboxedProcessLauncherDelegate>(),
-+        std::move(delegate),
-         std::move(cmd_line), GetID(), this, std::move(mojo_invitation_),
-         base::BindRepeating(&RenderProcessHostImpl::OnMojoError, id_),
-         GetV8SnapshotFilesToPreload());
--- a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
+++ b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
@ -6,7 +6,7 @@ Subject: unsandboxed_ppapi_processes_skip_zygote.patch
 Unsandboxed ppapi processes should skip zygote.

 diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc
-index 839bb1285a41e7d881c7ebd5e5e9d4817aeb26d9..f75ce4caac66284cb0aab8ed93f842d200e75ba7 100644
+index 7e40de399a031edf1320358c3e6b94afdec53d4d..2c08b54de2e457754900100950845730c9493366 100644
 --- a/content/browser/ppapi_plugin_process_host.cc
 +++ b/content/browser/ppapi_plugin_process_host.cc
@@ -111,6 +111,9 @@ class PpapiPluginSandboxedProcessLauncherDelegate
--- a/patches/chromium/upload_list_add_loadsync_method.patch
+++ b/patches/chromium/upload_list_add_loadsync_method.patch
@ -9,7 +9,7 @@ deprecated, and this API should be removed once the deprecated behavior
 is no longer supported.

 diff --git a/components/upload_list/upload_list.cc b/components/upload_list/upload_list.cc
-index 4a6b57e81398727977a9ad21ec601ee2f81e910b..03163affcc649ae53c2b7110d27dbd39ae00ae26 100644
+index c5c8119703c245132433f95fbd3764cfff41f8c3..9aa707d8b13b9c91a21ff5f38e680a7f6446503c 100644
 --- a/components/upload_list/upload_list.cc
 +++ b/components/upload_list/upload_list.cc
@@ -72,6 +72,10 @@ void UploadList::Load(base::OnceClosure callback) {
@ -24,10 +24,10 @@ index 4a6b57e81398727977a9ad21ec601ee2f81e910b..03163affcc649ae53c2b7110d27dbd39
                        const base::Time& end,
                        base::OnceClosure callback) {
 diff --git a/components/upload_list/upload_list.h b/components/upload_list/upload_list.h
-index 20358339df63ae2bb8b955870c5daf51b65f19f7..7cf89626bea8ee9436f15366446f053a479ac438 100644
+index c9dee47c8bb0917cd662d0565702890e953cdeea..b914d133df43fc2458af111a4dc83285bfc1aa02 100644
 --- a/components/upload_list/upload_list.h
 +++ b/components/upload_list/upload_list.h
-@@ -73,6 +73,8 @@ class UploadList : public base::RefCountedThreadSafe<UploadList> {
+@@ -75,6 +75,8 @@ class UploadList : public base::RefCountedThreadSafe<UploadList> {
   // overwrite the previously supplied one, and the first will not be called.
   void Load(base::OnceClosure callback);
 
--- a/patches/chromium/web_contents.patch
+++ b/patches/chromium/web_contents.patch
@ -9,10 +9,10 @@ is needed for OSR.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/226.

 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index f3884caf2320fb17bed8d84f342b5f8cc3b0b4c1..0945a202580d6eba49e48d68921f2624fe481b43 100644
+index 53f48964e6dfd0fb9b91762760b59a006ac7cc0c..ce9d64d9770e53e501d561af25094dd8f79bf331 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -2745,6 +2745,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -2764,6 +2764,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
   frame_tree_.Init(site_instance.get(), params.renderer_initiated_creation,
                    params.main_frame_name, params.is_prerendering);
 
@ -25,7 +25,7 @@ index f3884caf2320fb17bed8d84f342b5f8cc3b0b4c1..0945a202580d6eba49e48d68921f2624
   WebContentsViewDelegate* delegate =
       GetContentClient()->browser()->GetWebContentsViewDelegate(this);
 
-@@ -2755,6 +2761,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -2774,6 +2780,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
     view_.reset(CreateWebContentsView(this, delegate,
                                       &render_view_host_delegate_view_));
   }
@ -34,10 +34,10 @@ index f3884caf2320fb17bed8d84f342b5f8cc3b0b4c1..0945a202580d6eba49e48d68921f2624
   CHECK(view_.get());
 
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index f7c4564d7ab04ade8e85b4e4ebbf73cfe40bee66..dbbe18b2375112759d65bee0c53da0b58bad609c 100644
+index 7c81ae0070db8d4ed8712efc56a6af7d3f6261cf..b46afaac2bfbf349e759522498a1cfd6f53091c5 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
-@@ -87,8 +87,11 @@ class BrowserContext;
+@@ -88,8 +88,11 @@ class BrowserContext;
 class BrowserPluginGuestDelegate;
 class RenderFrameHost;
 class RenderViewHost;
@ -49,7 +49,7 @@ index f7c4564d7ab04ade8e85b4e4ebbf73cfe40bee66..dbbe18b2375112759d65bee0c53da0b5
 class WebUI;
 struct DropData;
 struct MHTMLGenerationParams;
-@@ -228,6 +231,10 @@ class WebContents : public PageNavigator,
+@@ -229,6 +232,10 @@ class WebContents : public PageNavigator,
     // Sandboxing flags set on the new WebContents.
     network::mojom::WebSandboxFlags starting_sandbox_flags;
 
--- a/patches/chromium/webview_cross_drag.patch
+++ b/patches/chromium/webview_cross_drag.patch
@ -8,7 +8,7 @@ This allows dragging and dropping between <webview>s.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/267

 diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
-index 81dab5885e269b9e69aa33fc9f7733dcea2fcfd7..8fa9e7d5223596b0178e8caf2c0bb55036c6f4b6 100644
+index d8d434d386b40388d804b6b887c10c4ada206d72..1f261fc8ae77b38d58b13eee2dcb6d53fb26a6f7 100644
 --- a/content/browser/web_contents/web_contents_view_aura.cc
 +++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -791,9 +791,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const {
--- a/patches/chromium/worker_context_will_destroy.patch
+++ b/patches/chromium/worker_context_will_destroy.patch
@ -10,7 +10,7 @@ An attempt to upstream this was made, but rejected:
 https://chromium-review.googlesource.com/c/chromium/src/+/1954347

 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
-index 204c63d3ad36eae56afbdd311cbd8549872d357c..ff1d4178b3c1e477730c5103b8907bc5d01dd9fe 100644
+index bf03da5697646830ded4210544700faafb4f686f..04ef16a04e8597d49e1730b9ea11191e350d63d1 100644
 --- a/content/public/renderer/content_renderer_client.h
 +++ b/content/public/renderer/content_renderer_client.h
@@ -372,6 +372,11 @@ class CONTENT_EXPORT ContentRendererClient {
@ -26,10 +26,10 @@ index 204c63d3ad36eae56afbdd311cbd8549872d357c..ff1d4178b3c1e477730c5103b8907bc5
   // An empty URL is returned if the URL is not overriden.
   virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index fcc6479c78f2415d1cdb7326b583c6546bed55d4..78f4629da1ad9447cb0cffc6548e25fd32b7220b 100644
+index 7aec578843ce514da499fc40ddb8a9ceb8e7a78f..8b2287e020172e17c5dc5fa28a19ac7a251d4732 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -928,6 +928,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
+@@ -910,6 +910,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
   WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
 }
 
@ -43,10 +43,10 @@ index fcc6479c78f2415d1cdb7326b583c6546bed55d4..78f4629da1ad9447cb0cffc6548e25fd
     const v8::Local<v8::Context>& worker) {
   GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index 9c18bcc27ec8a85d7ffe7aff5242d9eef75a3290..0235ca804e67a587d62b93ced9f026bc41efdf22 100644
+index 7a836b82ee155148ea8711b0f933331074d24524..4e3805bbef80957ff7d2c42282eaf9f8fedac46c 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
-@@ -195,6 +195,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -194,6 +194,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
   void DidStartWorkerThread() override;
   void WillStopWorkerThread() override;
   void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
@ -55,10 +55,10 @@ index 9c18bcc27ec8a85d7ffe7aff5242d9eef75a3290..0235ca804e67a587d62b93ced9f026bc
       const blink::WebSecurityOrigin& script_origin) override;
   blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel()
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index e6a0363371256789eb90b4cf675681d140e264bf..5c13b5d5eb584148b6ebaf5843660d314e2d503c 100644
+index b5904a748f70b86df3ffda9ed8f0cab1132ad35d..911708b508fb38c0f22b3ceaa92fc6a66308ac17 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -689,6 +689,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -684,6 +684,7 @@ class BLINK_PLATFORM_EXPORT Platform {
   virtual void DidStartWorkerThread() {}
   virtual void WillStopWorkerThread() {}
   virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
@ -67,10 +67,10 @@ index e6a0363371256789eb90b4cf675681d140e264bf..5c13b5d5eb584148b6ebaf5843660d31
       const WebSecurityOrigin& script_origin) {
     return false;
 diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc
-index d06931f255e68af0ff583b83ada2ecfd23b799a7..8533e1dbe847ee348c7f1b1e1fdf4270dfd4b2c1 100644
+index f3112e1618c7040e6781a19519a19cded9b1335d..aeeeae4b4b9429a6c3cb3c91ae0c642e74fdcc36 100644
 --- a/third_party/blink/renderer/core/workers/worker_thread.cc
 +++ b/third_party/blink/renderer/core/workers/worker_thread.cc
-@@ -737,6 +737,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
+@@ -738,6 +738,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
     nested_runner_->QuitNow();
   }
 
--- a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
+++ b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
@ -19,7 +19,7 @@ that clearly establishes the worker script is ready for evaluation with the scop
 initialized.

 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
-index 9888848f113b54cde1d0a004f8f5ea6984721b83..5f799d4c51842d425965f52f4c581d6eb241dab5 100644
+index 5735c09a753c5aaffe4bb75efe2a5bb7b0672ed6..a4a014778522a685c62c73e751f74d5f647d3aff 100644
 --- a/content/public/renderer/content_renderer_client.h
 +++ b/content/public/renderer/content_renderer_client.h
@@ -379,6 +379,11 @@ class CONTENT_EXPORT ContentRendererClient {
@ -35,10 +35,10 @@ index 9888848f113b54cde1d0a004f8f5ea6984721b83..5f799d4c51842d425965f52f4c581d6e
   // from the worker thread.
   virtual void WillDestroyWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index 78f4629da1ad9447cb0cffc6548e25fd32b7220b..10e45daae49431adda74e1141433e03e21caa6cf 100644
+index 8b2287e020172e17c5dc5fa28a19ac7a251d4732..f0ebbb0fc851f85811bef5aeb22f4d7414e3c84b 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -940,6 +940,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
+@@ -922,6 +922,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
       worker);
 }
 
@ -52,10 +52,10 @@ index 78f4629da1ad9447cb0cffc6548e25fd32b7220b..10e45daae49431adda74e1141433e03e
     const blink::WebSecurityOrigin& script_origin) {
   return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index 0235ca804e67a587d62b93ced9f026bc41efdf22..a7dc38fe54f8b9e5333089cbe52adc6a24d26018 100644
+index 4e3805bbef80957ff7d2c42282eaf9f8fedac46c..ad1551231a3411c86969b4108d66b3dc22c73e21 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
-@@ -195,6 +195,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -194,6 +194,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
   void DidStartWorkerThread() override;
   void WillStopWorkerThread() override;
   void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
@ -65,10 +65,10 @@ index 0235ca804e67a587d62b93ced9f026bc41efdf22..a7dc38fe54f8b9e5333089cbe52adc6a
   bool AllowScriptExtensionForServiceWorker(
       const blink::WebSecurityOrigin& script_origin) override;
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index 5c13b5d5eb584148b6ebaf5843660d314e2d503c..5f3d159b85fcefb6542e755556f4cfd15fa85b24 100644
+index 911708b508fb38c0f22b3ceaa92fc6a66308ac17..792ea5e1159f17354a5e6fd838f3e789469d37cd 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -689,6 +689,8 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -684,6 +684,8 @@ class BLINK_PLATFORM_EXPORT Platform {
   virtual void DidStartWorkerThread() {}
   virtual void WillStopWorkerThread() {}
   virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
--- a/patches/v8/add_realloc.patch
+++ b/patches/v8/add_realloc.patch
@ -12,10 +12,10 @@ when we override ReallocateBufferMemory, so we therefore need to implement
 Realloc on the v8 side.

 diff --git a/include/v8.h b/include/v8.h
-index 7cb19bbede03db217b2283ad0ff0df84aafdd168..b869480cddda91242738786d9ffdc24c3d7ac7dd 100644
+index fb53ca0b8a14f0f7c6e48e149c84fcfe3709fa12..289e2e7f2e4767aa8476126739dfcb7b8d71b401 100644
 --- a/include/v8.h
 +++ b/include/v8.h
-@@ -5355,6 +5355,13 @@ class V8_EXPORT ArrayBuffer : public Object {
+@@ -5373,6 +5373,13 @@ class V8_EXPORT ArrayBuffer : public Object {
      */
     virtual void* AllocateUninitialized(size_t length) = 0;
 
@ -30,10 +30,10 @@ index 7cb19bbede03db217b2283ad0ff0df84aafdd168..b869480cddda91242738786d9ffdc24c
      * Free the memory block of size |length|, pointed to by |data|.
      * That memory is guaranteed to be previously allocated by |Allocate|.
 diff --git a/src/api/api.cc b/src/api/api.cc
-index 6c6813995f74f1b0c3527d55848bfeb1bbb31a26..3575e9e1a594abdc2a443667f8889bcb27b605ac 100644
+index 335c161672e4d596dc87a80376330a03f295788f..2ee0731218f8565e48af4e37745ad95e914dfdf0 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -315,6 +315,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) {
+@@ -320,6 +320,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) {
   i::V8::SetSnapshotBlob(snapshot_blob);
 }
 
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@ -9,10 +9,10 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.

 diff --git a/BUILD.gn b/BUILD.gn
-index 4e9ef83a08dc641fcf4d4df23cd4b815a1a5ee2b..82f3723cb326a148eade470085f960ed261d1831 100644
+index b713df86b88286ce146e195d303483595bf22537..6e4ca3ff5f01adc9821d13650715b292b9a204b8 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -441,7 +441,7 @@ config("internal_config") {
+@@ -450,7 +450,7 @@ config("internal_config") {
     ":cppgc_header_features",
   ]
 
@ -21,7 +21,7 @@ index 4e9ef83a08dc641fcf4d4df23cd4b815a1a5ee2b..82f3723cb326a148eade470085f960ed
     defines += [ "BUILDING_V8_SHARED" ]
   }
 }
-@@ -4993,7 +4993,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5049,7 +5049,7 @@ if (current_toolchain == v8_generator_toolchain) {
       "src/interpreter/bytecodes.h",
     ]
 
@ -30,7 +30,7 @@ index 4e9ef83a08dc641fcf4d4df23cd4b815a1a5ee2b..82f3723cb326a148eade470085f960ed
 
     deps = [
       ":v8_libbase",
-@@ -5031,6 +5031,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
+@@ -5087,6 +5087,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
 
     configs = [ ":internal_config" ]
 
--- a/patches/v8/dcheck.patch
+++ b/patches/v8/dcheck.patch
@ -6,10 +6,10 @@ Subject: dcheck.patch
 https://github.com/auchenberg/volkswagen

 diff --git a/src/api/api.cc b/src/api/api.cc
-index 3575e9e1a594abdc2a443667f8889bcb27b605ac..e5bee991f774f13f2b3b89b980f3b84a9a540458 100644
+index 2ee0731218f8565e48af4e37745ad95e914dfdf0..26b4aa9b364524664d78d6ceaa0d342887bcfa27 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -8887,7 +8887,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -8917,7 +8917,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
 }
 
 void Isolate::PerformMicrotaskCheckpoint() {
@ -19,10 +19,10 @@ index 3575e9e1a594abdc2a443667f8889bcb27b605ac..e5bee991f774f13f2b3b89b980f3b84a
   isolate->default_microtask_queue()->PerformCheckpoint(this);
 }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index 23b84296be18f17371ae1aaa3d4389e23963e313..5b53bc8ee05824bab22302e8a731839f3b3f2318 100644
+index 2c1b6788f3b1648855aa1496eebfb679461de64f..b8a77816772593211cc015589c6ee17d06374c6f 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
-@@ -5551,9 +5551,9 @@ void Heap::TearDown() {
+@@ -5553,9 +5553,9 @@ void Heap::TearDown() {
 void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
                                  GCType gc_type, void* data) {
   DCHECK_NOT_NULL(callback);
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).

 diff --git a/BUILD.gn b/BUILD.gn
-index 993d57f342e777b6376823d7e68b0fae6a374868..d98a0465115b4a5d8a24385d4d3eacc45bd34c44 100644
+index 27125e6525139c6aa39278ab1a52b7befd4ea108..e948fc4bbb99e204bf2a91592f588a3fc41d7761 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -441,6 +441,10 @@ config("internal_config") {
+@@ -450,6 +450,10 @@ config("internal_config") {
     ":cppgc_header_features",
   ]
 
--- a/patches/v8/export_symbols_needed_for_windows_build.patch
+++ b/patches/v8/export_symbols_needed_for_windows_build.patch
@ -19,7 +19,7 @@ index c68445597f562d043953bd38baf25d818646de68..60f519ad45da2680d24ea2012446f5d6
   explicit inline Relocatable(Isolate* isolate);
   inline virtual ~Relocatable();
 diff --git a/src/objects/ordered-hash-table.h b/src/objects/ordered-hash-table.h
-index ca1d29d2fd686453747efa2e1d18fedba3883929..db5ab3f57ae2e75e8b90966161359926f70bf7cd 100644
+index 1746e2dc89625a00c6cae0b249142a11de7072c3..cd076405a17f99f77d51b6c146223becf4fb4587 100644
 --- a/src/objects/ordered-hash-table.h
 +++ b/src/objects/ordered-hash-table.h
@@ -63,7 +63,7 @@ namespace internal {
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.

 diff --git a/BUILD.gn b/BUILD.gn
-index 82f3723cb326a148eade470085f960ed261d1831..993d57f342e777b6376823d7e68b0fae6a374868 100644
+index 6e4ca3ff5f01adc9821d13650715b292b9a204b8..27125e6525139c6aa39278ab1a52b7befd4ea108 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -5005,7 +5005,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5061,7 +5061,6 @@ if (current_toolchain == v8_generator_toolchain) {
 
 if (current_toolchain == v8_snapshot_toolchain) {
   v8_executable("mksnapshot") {