Bump v20.0.1

docs: update categories to match sidebar (#35202 )
This page describes each of the categories available in the sidebar, but some of the category titles didn't match. Co-authored-by: Maya Nedeljković Batić <maya.nedeljko@gmail.com>
2026-02-26 03:01:17 -05:00 · 2022-08-03 08:31:32 -07:00 · 2022-08-03 10:15:52 -04:00 · 2022-08-03 10:10:31 -04:00 · 2022-08-03 10:09:54 -04:00 · 2022-08-02 15:55:25 -04:00
419 changed files with 3930 additions and 6709 deletions
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -650,6 +650,7 @@ step-persist-data-for-tests: &step-persist-data-for-tests
      - src/out/Default/mksnapshot.zip
      - src/out/Default/chromedriver.zip
      - src/out/Default/gen/node_headers
+      - src/out/Default/overlapped-checker
      - src/out/ffmpeg/ffmpeg.zip
      - src/electron
      - src/third_party/electron_node
@@ -676,13 +677,6 @@ step-electron-dist-unzip: &step-electron-dist-unzip
      #    passed.
      unzip -:o dist.zip

-step-ffmpeg-unzip: &step-ffmpeg-unzip
-  run:
-    name: Unzip ffmpeg.zip
-    command: |
-      cd src/out/ffmpeg
-      unzip -:o ffmpeg.zip
-
 step-mksnapshot-unzip: &step-mksnapshot-unzip
  run:
    name: Unzip mksnapshot.zip
@@ -711,13 +705,6 @@ step-ffmpeg-build: &step-ffmpeg-build
      cd src
      ninja -C out/ffmpeg electron:electron_ffmpeg_zip -j $NUMBER_OF_NINJA_PROCESSES

-step-verify-ffmpeg: &step-verify-ffmpeg
-  run:
-    name: Verify ffmpeg
-    command: |
-      cd src
-      python electron/script/verify-ffmpeg.py --source-root "$PWD" --build-dir out/Default --ffmpeg-path out/ffmpeg
-
 step-verify-mksnapshot: &step-verify-mksnapshot
  run:
    name: Verify mksnapshot
@@ -1032,53 +1019,6 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
    #Compile ts/js to verify doc change didn't break anything
    - *step-ts-compile

-steps-native-tests: &steps-native-tests
-  steps:
-    - attach_workspace:
-        at: .
-    - *step-depot-tools-add-to-path
-    - install-python2-mac
-    - *step-setup-env-for-build
-    - *step-setup-goma-for-build
-    - *step-wait-for-goma
-    - *step-gn-gen-default
-
-    - run:
-        name: Build tests
-        command: |
-          cd src
-          ninja -C out/Default $BUILD_TARGET
-    - *step-show-goma-stats
-
-    - *step-setup-linux-for-headless-testing
-    - run:
-        name: Run tests
-        command: |
-          mkdir test_results
-          python src/electron/script/native-tests.py run \
-            --config $TESTS_CONFIG \
-            --tests-dir src/out/Default \
-            --output-dir test_results  \
-            $TESTS_ARGS
-
-    - store_artifacts:
-        path: test_results
-        destination: test_results  # Put it in the root folder.
-    - store_test_results:
-        path: test_results
-
-steps-verify-ffmpeg: &steps-verify-ffmpeg
-  steps:
-    - attach_workspace:
-        at: .
-    - *step-depot-tools-add-to-path
-    - *step-electron-dist-unzip
-    - *step-ffmpeg-unzip
-    - *step-setup-linux-for-headless-testing
-
-    - *step-verify-ffmpeg
-    - *step-maybe-notify-slack-failure
-
 steps-tests: &steps-tests
  steps:
    - attach_workspace:
@@ -1486,7 +1426,7 @@ commands:
            - *step-electron-build
            - *step-maybe-electron-dist-strip
            - step-electron-dist-build:
-                additional-targets: shell_browser_ui_unittests third_party/electron_node:headers electron:hunspell_dictionaries_zip
+                additional-targets: shell_browser_ui_unittests third_party/electron_node:headers third_party/electron_node:overlapped-checker electron:hunspell_dictionaries_zip

            - *step-show-goma-stats

@@ -1884,7 +1824,7 @@ jobs:
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
    <<: *steps-electron-gn-check

-  osx-publish-x64-skip-checkout:
+  osx-publish-x64:
    executor:
      name: macos
      size: macos.x86.medium.gen2
@@ -1905,7 +1845,7 @@ jobs:
                attach: true
                checkout: false

-  osx-publish-arm64-skip-checkout:
+  osx-publish-arm64:
    executor:
      name: macos
      size: macos.x86.medium.gen2
@@ -1975,7 +1915,7 @@ jobs:
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
    <<: *steps-electron-gn-check

-  mas-publish-x64-skip-checkout:
+  mas-publish-x64:
    executor:
      name: macos
      size: macos.x86.medium.gen2
@@ -1996,7 +1936,7 @@ jobs:
                attach: true
                checkout: false

-  mas-publish-arm64-skip-checkout:
+  mas-publish-arm64:
    executor:
      name: macos
      size: macos.x86.medium.gen2
@@ -2082,16 +2022,6 @@ jobs:
      <<: *env-stack-dumping
    <<: *steps-test-node

-  linux-x64-verify-ffmpeg:
-    executor:
-      name: linux-docker
-      size: medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-headless-testing
-      <<: *env-send-slack-notifications
-    <<: *steps-verify-ffmpeg
-
  linux-arm-testing-tests:
    executor: linux-arm
    environment:
@@ -2148,17 +2078,6 @@ jobs:
      <<: *env-runner
    <<: *steps-tests

-  # Layer 4: Summary.
-  linux-release-summary:
-    executor:
-      name: linux-docker
-      size: medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-send-slack-notifications
-    steps:
-      - *step-maybe-notify-slack-success
-
 # List all workflows
 workflows:
  docs-only:
@@ -2184,19 +2103,19 @@ workflows:
    when: << pipeline.parameters.run-macos-publish >>
    jobs:
    - mac-checkout
-    - osx-publish-x64-skip-checkout:
+    - osx-publish-x64:
        requires:
          - mac-checkout
        context: release-env
-    - mas-publish-x64-skip-checkout:
+    - mas-publish-x64:
        requires:
          - mac-checkout
        context: release-env
-    - osx-publish-arm64-skip-checkout:
+    - osx-publish-arm64:
        requires:
          - mac-checkout
        context: release-env
-    - mas-publish-arm64-skip-checkout:
+    - mas-publish-arm64:
        requires:
          - mac-checkout
        context: release-env
--- a/.github/workflows/semantic.yml
+++ b/.github/workflows/semantic.yml
@@ -7,8 +7,14 @@ on:
      - edited
      - synchronize

+permissions:
+  contents: read
+
 jobs:
  main:
+    permissions:
+      pull-requests: read  # for amannn/action-semantic-pull-request to analyze PRs
+      statuses: write  # for amannn/action-semantic-pull-request to mark status of analyzed PR
    name: Validate PR Title
    runs-on: ubuntu-latest
    steps:
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -37,7 +37,7 @@ if (is_mac) {
  import("build/rules.gni")

  assert(
-      mac_deployment_target == "10.11.0",
+      mac_deployment_target == "10.13",
      "Chromium has updated the mac_deployment_target, please update this assert, update the supported versions documentation (docs/tutorial/support.md) and flag this as a breaking change")
 }

@@ -79,6 +79,13 @@ if (is_linux) {
    ]
  }

+  # Generates electron_gtk_stubs.h header which contains
+  # stubs for extracting function ptrs from the gtk library.
+  # Function signatures for which stubs are required should be
+  # declared in electron_gtk.sigs, currently this file contains
+  # signatures for the functions used with native file chooser
+  # implementation. In future, this file can be extended to contain
+  # gtk4 stubs to switch gtk version in runtime.
  generate_stubs("electron_gtk_stubs") {
    sigs = [
      "shell/browser/ui/electron_gdk_pixbuf.sigs",
@@ -226,6 +233,7 @@ action("electron_js2c") {
 action("generate_config_gypi") {
  outputs = [ "$root_gen_dir/config.gypi" ]
  script = "script/generate-config-gypi.py"
+  inputs = [ "//third_party/electron_node/configure.py" ]
  args = rebase_path(outputs) + [ target_cpu ]
 }

@@ -362,6 +370,7 @@ source_set("electron_lib") {
    "shell/common/api:mojo",
    "//base:base_static",
    "//base/allocator:buildflags",
+    "//chrome:strings",
    "//chrome/app:command_ids",
    "//chrome/app/resources:platform_locale_settings",
    "//components/autofill/core/common:features",
@@ -557,8 +566,8 @@ source_set("electron_lib") {
      "//ui/base/ime/linux",
      "//ui/events/devices/x11",
      "//ui/events/platform/x11",
-      "//ui/gtk",
      "//ui/views/controls/webview",
+      "//ui/views/linux_ui:linux_ui_factory",
      "//ui/wm",
    ]
    if (ozone_platform_x11) {
@@ -722,14 +731,6 @@ source_set("electron_lib") {

  sources += get_target_outputs(":electron_fuses")

-  if (is_win && enable_win_dark_mode_window_ui) {
-    sources += [
-      "shell/browser/win/dark_mode.cc",
-      "shell/browser/win/dark_mode.h",
-    ]
-    libs += [ "uxtheme.lib" ]
-  }
-
  if (allow_runtime_configurable_key_storage) {
    defines += [ "ALLOW_RUNTIME_CONFIGURABLE_KEY_STORAGE" ]
  }
@@ -907,7 +908,10 @@ if (is_mac) {
      assert(defined(invoker.helper_name_suffix))

      output_name = electron_helper_name + invoker.helper_name_suffix
-      deps = [ ":electron_framework+link" ]
+      deps = [
+        ":electron_framework+link",
+        "//base/allocator:early_zone_registration_mac",
+      ]
      if (!is_mas_build) {
        deps += [ "//sandbox/mac:seatbelt" ]
      }
@@ -1067,6 +1071,7 @@ if (is_mac) {
      ":electron_app_plist",
      ":electron_app_resources",
      ":electron_fuses",
+      "//base/allocator:early_zone_registration_mac",
      "//electron/buildflags",
    ]
    if (is_mas_build) {
--- a/9
+++ b/9
@@ -2,14 +2,11 @@ gclient_gn_args_from = 'src'

 vars = {
  'chromium_version':
-    '102.0.5005.167',
+    '104.0.5112.81',
  'node_version':
-    'v16.14.2',
+    'v16.15.0',
  'nan_version':
-    # The following commit hash of NAN is v2.14.2 with *only* changes to the
-    # test suite. This should be updated to a specific tag when one becomes
-    # available.
-    '65b32af46e9d7fab2e4ff657751205b3865f4920',
+    '16fa32231e2ccd89d2804b3f765319128b20c4ac',
  'squirrel.mac_version':
    '0e5d146ba13101a1302d59ea6e6e0b3cace4ae38',

--- a/2
+++ b/2
@@ -1 +1 @@
-19.0.14
+20.0.1
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,10 +23,6 @@
 # https://www.appveyor.com/docs/build-configuration/#secure-variables
 # https://www.appveyor.com/docs/build-configuration/#custom-environment-variables

-# Uncomment these lines to enable RDP
-#on_finish:
-#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-
 version: 1.0.{build}
 build_cloud: electron-16-core
 image: vs2019bt-16.16.11
@@ -231,6 +227,8 @@ deploy_script:
        node script/release/ci-release-build.js --job=electron-woa-testing --ci=GHA --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
      }
 on_finish:
+  # Uncomment this lines to enable RDP
+  #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
  - cd ..
  - if exist out\Default\windows_toolchain_profile.json ( appveyor-retry appveyor PushArtifact out\Default\windows_toolchain_profile.json )
  - if exist out\Default\dist.zip (appveyor-retry appveyor PushArtifact out\Default\dist.zip)
@@ -245,4 +243,5 @@ on_finish:
      if ((Test-Path "pdb.zip") -And ($env:GN_CONFIG -ne 'release')) {
        appveyor-retry appveyor PushArtifact pdb.zip
      }
+
  - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -2,7 +2,7 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]

 # Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
-node_module_version = 106
+node_module_version = 107

 v8_promise_internal_field_count = 1
 v8_embedder_string = "-electron.0"
@@ -32,9 +32,18 @@ dawn_enable_vulkan_validation_layers = false
 # See https://chromium-review.googlesource.com/c/chromium/src/+/2774898.
 enable_pseudolocales = false

-is_cfi = false
-
 # Make application name configurable at runtime for cookie crypto
 allow_runtime_configurable_key_storage = true

+# CET shadow stack is incompatible with v8, until v8 is CET compliant
+# enabling this flag causes main process crashes where CET is enabled
+# Ref: https://source.chromium.org/chromium/chromium/src/+/45fba672185aae233e75d6ddc81ea1e0b30db050:v8/BUILD.gn;l=357
 enable_cet_shadow_stack = false
+
+# For similar reasons, disable CFI, which is not well supported in V8.
+# Chromium doesn't have any problems with this because they do not run
+# V8 in the browser process.
+# Ref: https://source.chromium.org/chromium/chromium/src/+/45fba672185aae233e75d6ddc81ea1e0b30db050:v8/BUILD.gn;l=281
+is_cfi = false
+
+v8_enable_sandboxed_pointers = false
--- a/buildflags/BUILD.gn
+++ b/buildflags/BUILD.gn
@@ -19,7 +19,6 @@ buildflag_header("buildflags") {
    "ENABLE_ELECTRON_EXTENSIONS=$enable_electron_extensions",
    "ENABLE_BUILTIN_SPELLCHECKER=$enable_builtin_spellchecker",
    "ENABLE_PICTURE_IN_PICTURE=$enable_picture_in_picture",
-    "ENABLE_WIN_DARK_MODE_WINDOW_UI=$enable_win_dark_mode_window_ui",
    "OVERRIDE_LOCATION_PROVIDER=$enable_fake_location_provider",
  ]
 }
--- a/buildflags/buildflags.gni
+++ b/buildflags/buildflags.gni
@@ -31,7 +31,4 @@ declare_args() {

  # Enable Spellchecker support
  enable_builtin_spellchecker = true
-
-  # Undocumented Windows dark mode API
-  enable_win_dark_mode_window_ui = false
 }
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -55,14 +55,6 @@ static_library("chrome") {
    "//chrome/browser/process_singleton.h",
    "//chrome/browser/process_singleton_internal.cc",
    "//chrome/browser/process_singleton_internal.h",
-    "//chrome/browser/themes/browser_theme_pack.cc",
-    "//chrome/browser/themes/browser_theme_pack.h",
-    "//chrome/browser/themes/custom_theme_supplier.cc",
-    "//chrome/browser/themes/custom_theme_supplier.h",
-    "//chrome/browser/themes/theme_properties.cc",
-    "//chrome/browser/themes/theme_properties.h",
-    "//chrome/browser/ui/color/chrome_color_mixers.cc",
-    "//chrome/browser/ui/color/chrome_color_mixers.h",
    "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.cc",
    "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h",
    "//chrome/browser/ui/exclusive_access/exclusive_access_controller_base.cc",
@@ -77,11 +69,7 @@ static_library("chrome") {
    "//chrome/browser/ui/exclusive_access/keyboard_lock_controller.h",
    "//chrome/browser/ui/exclusive_access/mouse_lock_controller.cc",
    "//chrome/browser/ui/exclusive_access/mouse_lock_controller.h",
-    "//chrome/browser/ui/frame/window_frame_util.cc",
-    "//chrome/browser/ui/frame/window_frame_util.h",
    "//chrome/browser/ui/native_window_tracker.h",
-    "//chrome/browser/ui/ui_features.cc",
-    "//chrome/browser/ui/ui_features.h",
    "//chrome/browser/ui/views/eye_dropper/eye_dropper.cc",
    "//chrome/browser/ui/views/eye_dropper/eye_dropper.h",
    "//chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc",
@@ -101,6 +89,8 @@ static_library("chrome") {
      "//chrome/browser/icon_loader_mac.mm",
      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm",
      "//chrome/browser/media/webrtc/window_icon_util_mac.mm",
      "//chrome/browser/process_singleton_mac.mm",
      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
@@ -119,8 +109,6 @@ static_library("chrome") {
      "//chrome/browser/ui/view_ids.h",
      "//chrome/browser/win/chrome_process_finder.cc",
      "//chrome/browser/win/chrome_process_finder.h",
-      "//chrome/browser/win/titlebar_config.cc",
-      "//chrome/browser/win/titlebar_config.h",
      "//chrome/browser/win/titlebar_config.h",
      "//chrome/child/v8_crashpad_support_win.cc",
      "//chrome/child/v8_crashpad_support_win.h",
@@ -142,7 +130,6 @@ static_library("chrome") {

  public_deps = [
    "//chrome/browser:dev_ui_browser_resources",
-    "//chrome/browser/ui/color:mixers",
    "//chrome/common",
    "//chrome/common:version_header",
    "//components/keyed_service/content",
--- a/default_app/default_app.ts
+++ b/default_app/default_app.ts
@@ -66,9 +66,9 @@ async function createWindow (backgroundColor?: string) {
  mainWindow = new BrowserWindow(options);
  mainWindow.on('ready-to-show', () => mainWindow!.show());

-  mainWindow.webContents.on('new-window', (event, url) => {
-    event.preventDefault();
-    shell.openExternal(decorateURL(url));
+  mainWindow.webContents.setWindowOpenHandler(details => {
+    shell.openExternal(decorateURL(details.url));
+    return { action: 'deny' };
  });

  mainWindow.webContents.session.setPermissionRequestHandler((webContents, permission, done) => {
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -582,6 +582,10 @@ You should seek to use the `steal` option as sparingly as possible.

 Hides all application windows without minimizing them.

+### `app.isHidden()` _macOS_
+
+Returns `boolean` - `true` if the application—including all of its windows—is hidden (e.g. with `Command-H`), `false` otherwise.
+
 ### `app.show()` _macOS_

 Shows application windows after they were hidden. Does not automatically focus
@@ -607,9 +611,18 @@ Returns `string` - The current application directory.
    * `%APPDATA%` on Windows
    * `$XDG_CONFIG_HOME` or `~/.config` on Linux
    * `~/Library/Application Support` on macOS
-  * `userData` The directory for storing your app's configuration files, which by
-    default it is the `appData` directory appended with your app's name.
-  * `cache`
+  * `userData` The directory for storing your app's configuration files, which
+    by default is the `appData` directory appended with your app's name. By
+    convention files storing user data should be written to this directory, and
+    it is not recommended to write large files here because some environments
+    may backup this directory to cloud storage.
+  * `sessionData` The directory for storing data generated by `Session`, such
+    as localStorage, cookies, disk cache, downloaded dictionaries, network
+    state, devtools files. By default this points to `userData`. Chromium may
+    write very large disk cache here, so if your app does not rely on browser
+    storage like localStorage or cookies to save user data, it is recommended
+    to set this directory to other locations to avoid polluting the `userData`
+    directory.
  * `temp` Temporary directory.
  * `exe` The current executable file.
  * `module` The `libchromiumcontent` library.
@@ -659,9 +672,9 @@ In that case, the directory should be created with `fs.mkdirSync` or similar.

 You can only override paths of a `name` defined in `app.getPath`.

-By default, web pages' cookies and caches will be stored under the `userData`
+By default, web pages' cookies and caches will be stored under the `sessionData`
 directory. If you want to change this location, you have to override the
-`userData` path before the `ready` event of the `app` module is emitted.
+`sessionData` path before the `ready` event of the `app` module is emitted.

 ### `app.getVersion()`

--- a/docs/api/browser-view.md
+++ b/docs/api/browser-view.md
@@ -11,6 +11,9 @@ relative to its owning window. It is meant to be an alternative to the

 Process: [Main](../glossary.md#main-process)

+This module cannot be used until the `ready` event of the `app`
+module is emitted.
+
 ### Example

 ```javascript
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -4,6 +4,9 @@

 Process: [Main](../glossary.md#main-process)

+This module cannot be used until the `ready` event of the `app`
+module is emitted.
+
 ```javascript
 // In the main process.
 const { BrowserWindow } = require('electron')
@@ -422,13 +425,17 @@ Possible values are:

 * On Linux, possible types are `desktop`, `dock`, `toolbar`, `splash`,
  `notification`.
-* On macOS, possible types are `desktop`, `textured`.
+* On macOS, possible types are `desktop`, `textured`, `panel`.
  * The `textured` type adds metal gradient appearance
-    (`NSTexturedBackgroundWindowMask`).
+    (`NSWindowStyleMaskTexturedBackground`).
  * The `desktop` type places the window at the desktop background window level
    (`kCGDesktopWindowLevel - 1`). Note that desktop window will not receive
    focus, keyboard or mouse events, but you can use `globalShortcut` to receive
    input sparingly.
+  * The `panel` type enables the window to float on top of full-screened apps
+    by adding the `NSWindowStyleMaskNonactivatingPanel` style mask,normally
+    reserved for NSPanel, at runtime. Also, the window will appear on all
+    spaces (desktops).
 * On Windows, possible type is `toolbar`.

 ### Instance Events
@@ -1316,7 +1323,7 @@ win.setSheetOffset(toolbarRect.height)

 Starts or stops flashing the window to attract user's attention.

-#### `win.setSkipTaskbar(skip)`
+#### `win.setSkipTaskbar(skip)` _macOS_ _Windows_

 * `skip` boolean

--- a/docs/api/context-bridge.md
+++ b/docs/api/context-bridge.md
@@ -35,7 +35,7 @@ page you load in your renderer executes code in this world.

 When `contextIsolation` is enabled in your `webPreferences` (this is the default behavior since Electron 12.0.0), your `preload` scripts run in an
 "Isolated World".  You can read more about context isolation and what it affects in the
-[security](../tutorial/security.md#3-enable-context-isolation-for-remote-content) docs.
+[security](../tutorial/security.md#3-enable-context-isolation) docs.

 ## Methods

--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -253,9 +253,11 @@ Returns:
  * `device` [HIDDevice[]](structures/hid-device.md)
  * `frame` [WebFrameMain](web-frame-main.md)

-Emitted when a new HID device becomes available. For example, when a new USB device is plugged in.
-
-This event will only be emitted after `navigator.hid.requestDevice` has been called and `select-hid-device` has fired.
+Emitted after `navigator.hid.requestDevice` has been called and
+`select-hid-device` has fired if a new device becomes available before
+the callback from `select-hid-device` is called.  This event is intended for
+use when using a UI to ask users to pick a device so that the UI can be updated
+with the newly added device.

 #### Event: 'hid-device-removed'

@@ -266,9 +268,24 @@ Returns:
  * `device` [HIDDevice[]](structures/hid-device.md)
  * `frame` [WebFrameMain](web-frame-main.md)

-Emitted when a HID device has been removed.  For example, this event will fire when a USB device is unplugged.
+Emitted after `navigator.hid.requestDevice` has been called and
+`select-hid-device` has fired if a device has been removed before the callback
+from `select-hid-device` is called.  This event is intended for use when using
+a UI to ask users to pick a device so that the UI can be updated to remove the
+specified device.

-This event will only be emitted after `navigator.hid.requestDevice` has been called and `select-hid-device` has fired.
+#### Event: 'hid-device-revoked'
+
+Returns:
+
+* `event` Event
+* `details` Object
+  * `device` [HIDDevice[]](structures/hid-device.md)
+  * `origin` string (optional) - The origin that the device has been revoked from.
+
+Emitted after `HIDDevice.forget()` has been called.  This event can be used
+to help maintain persistent storage of permissions when
+`setDevicePermissionHandler` is used.

 #### Event: 'select-serial-port'

@@ -348,7 +365,11 @@ Returns:
 * `port` [SerialPort](structures/serial-port.md)
 * `webContents` [WebContents](web-contents.md)

-Emitted after `navigator.serial.requestPort` has been called and `select-serial-port` has fired if a new serial port becomes available.  For example, this event will fire when a new USB device is plugged in.
+Emitted after `navigator.serial.requestPort` has been called and
+`select-serial-port` has fired if a new serial port becomes available before
+the callback from `select-serial-port` is called.  This event is intended for
+use when using a UI to ask users to pick a port so that the UI can be updated
+with the newly added port.

 #### Event: 'serial-port-removed'

@@ -358,7 +379,11 @@ Returns:
 * `port` [SerialPort](structures/serial-port.md)
 * `webContents` [WebContents](web-contents.md)

-Emitted after `navigator.serial.requestPort` has been called and `select-serial-port` has fired if a serial port has been removed.  For example, this event will fire when a USB device is unplugged.
+Emitted after `navigator.serial.requestPort` has been called and
+`select-serial-port` has fired if a serial port has been removed before the
+callback from `select-serial-port` is called.  This event is intended for use
+when using a UI to ask users to pick a port so that the UI can be updated
+to remove the specified port.

 ### Instance Methods

@@ -680,7 +705,6 @@ session.fromPartition('some-partition').setPermissionCheckHandler((webContents,
    * `deviceType` string - The type of device that permission is being requested on, can be `hid` or `serial`.
    * `origin` string - The origin URL of the device permission check.
    * `device` [HIDDevice](structures/hid-device.md) | [SerialPort](structures/serial-port.md)- the device that permission is being requested for.
-    * `frame` [WebFrameMain](web-frame-main.md) - WebFrameMain checking the device permission.

 Sets the handler which can be used to respond to device permission checks for the `session`.
 Returning `true` will allow the device to be permitted and `false` will reject it.
@@ -688,8 +712,8 @@ To clear the handler, call `setDevicePermissionHandler(null)`.
 This handler can be used to provide default permissioning to devices without first calling for permission
 to devices (eg via `navigator.hid.requestDevice`).  If this handler is not defined, the default device
 permissions as granted through device selection (eg via `navigator.hid.requestDevice`) will be used.
-Additionally, the default behavior of Electron is to store granted device permision through the lifetime
-of the corresponding WebContents.  If longer term storage is needed, a developer can store granted device
+Additionally, the default behavior of Electron is to store granted device permision in memory.
+If longer term storage is needed, a developer can store granted device
 permissions (eg when handling the `select-hid-device` event) and then read from that storage with `setDevicePermissionHandler`.

 ```javascript
@@ -1025,7 +1049,7 @@ is emitted.

 #### `ses.getStoragePath()`

-Returns `string | null` - The absolute file system path where data for this
+A `string | null` indicating the absolute file system path where data for this
 session is persisted on disk.  For in memory sessions this returns `null`.

 ### Instance Properties
--- a/docs/api/tray.md
+++ b/docs/api/tray.md
@@ -25,20 +25,15 @@ app.whenReady().then(() => {
 })
 ```

-__Platform Considerations__
-
-If you want to keep exact same behaviors on all platforms, you should not
-rely on the `click` event; instead, always attach a context menu to the tray icon.
-
-__Linux__
+__Platform limitations:__

+* On Linux the app indicator will be used if it is supported, otherwise
+  `GtkStatusIcon` will be used instead.
 * On Linux distributions that only have app indicator support, you have to
  install `libappindicator1` to make the tray icon work.
-* The app indicator will be used if it is supported, otherwise
-  `GtkStatusIcon` will be used instead.
 * App indicator will only be shown when it has a context menu.
-* The `click` event is ignored when using the app indicator.
-* In order for changes made to individual `MenuItem`s to take effect,
+* When app indicator is used on Linux, the `click` event is ignored.
+* On Linux in order for changes made to individual `MenuItem`s to take effect,
  you have to call `setContextMenu` again. For example:

 ```javascript
@@ -60,16 +55,10 @@ app.whenReady().then(() => {
 })
 ```

-__MacOS__
+* On Windows it is recommended to use `ICO` icons to get best visual effects.

-* Icons passed to the Tray constructor should be [Template Images](native-image.md#template-image).
-* To make sure your icon isn't grainy on retina monitors, be sure your `@2x` image is 144dpi.
-* If you are bundling your application (e.g., with webpack for development), be sure that the file names are not being mangled or hashed. The filename needs to end in Template, and the `@2x` image needs to have the same filename as the standard image, or MacOS will not magically invert your image's colors or use the high density image.
-* 16x16 (72dpi) and 32x32@2x (144dpi) work well for most icons.
-
-__Windows__
-
-* It is recommended to use `ICO` icons to get best visual effects.
+If you want to keep exact same behaviors on all platforms, you should not
+rely on the `click` event and always attach a context menu to the tray icon.

 ### `new Tray(image, [guid])`

--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -1635,8 +1635,6 @@ Opens the devtools.
 When `contents` is a `<webview>` tag, the `mode` would be `detach` by default,
 explicitly passing an empty `mode` can force using last used dock state.

-On Windows, if Windows Control Overlay is enabled, Devtools will be opened with `mode: 'detach'`.
-
 #### `contents.closeDevTools()`

 Closes the devtools.
--- a/docs/api/webview-tag.md
+++ b/docs/api/webview-tag.md
@@ -556,7 +556,7 @@ Stops any `findInPage` request for the `webview` with the provided `action`.
  * `header` string (optional) - string to be printed as page header.
  * `footer` string (optional) - string to be printed as page footer.
  * `pageSize` string | Size (optional) - Specify page size of the printed document. Can be `A3`,
-  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`.
+  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height` in microns.

 Returns `Promise<void>`

--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -34,6 +34,13 @@ window manager. There is not a direct equivalent for Wayland, and the known
 workarounds have unacceptable tradeoffs (e.g. Window.is_skip_taskbar in GNOME
 requires unsafe mode), so Electron is unable to support this feature on Linux.

+### API Changed: `session.setDevicePermissionHandler(handler)`
+
+The handler invoked when `session.setDevicePermissionHandler(handler)` is used
+has a change to its arguments.  This handler no longer is passed a frame
+`[WebFrameMain](api/web-frame-main.md)`, but instead is passed the `origin`, which
+is the origin that is checking for device permission.
+
 ## Planned Breaking API Changes (19.0)

 ### Removed: IA32 Linux binaries
@@ -375,7 +382,7 @@ value.
 In Electron 12, `contextIsolation` will be enabled by default.  To restore
 the previous behavior, `contextIsolation: false` must be specified in WebPreferences.

-We [recommend having contextIsolation enabled](tutorial/security.md#3-enable-context-isolation-for-remote-content) for the security of your application.
+We [recommend having contextIsolation enabled](tutorial/security.md#3-enable-context-isolation) for the security of your application.

 Another implication is that `require()` cannot be used in the renderer process unless
 `nodeIntegration` is `true` and `contextIsolation` is `false`.
--- a/docs/fiddles/features/web-hid/main.js
+++ b/docs/fiddles/features/web-hid/main.js
@@ -8,20 +8,24 @@ function createWindow () {
  })
  
  mainWindow.webContents.session.on('select-hid-device', (event, details, callback) => {
+    //Add events to handle devices being added or removed before the callback on
+    //`select-hid-device` is called.
+    mainWindow.webContents.session.on('hid-device-added', (event, device) => {    
+      console.log('hid-device-added FIRED WITH', device)
+      //Optionally update details.deviceList
+    })
+  
+    mainWindow.webContents.session.on('hid-device-removed', (event, device) => {    
+      console.log('hid-device-removed FIRED WITH', device)
+      //Optionally update details.deviceList
+    })
+
    event.preventDefault()
    if (details.deviceList && details.deviceList.length > 0) {
      callback(details.deviceList[0].deviceId)
    }
  })

-  mainWindow.webContents.session.on('hid-device-added', (event, device) => {    
-    console.log('hid-device-added FIRED WITH', device)
-  })
-
-  mainWindow.webContents.session.on('hid-device-removed', (event, device) => {    
-    console.log('hid-device-removed FIRED WITH', device)
-  })
-
  mainWindow.webContents.session.setPermissionCheckHandler((webContents, permission, requestingOrigin, details) => {
    if (permission === 'hid' && details.securityOrigin === 'file:///') {
      return true
--- a/docs/fiddles/features/web-serial/main.js
+++ b/docs/fiddles/features/web-serial/main.js
@@ -8,6 +8,19 @@ function createWindow () {
  })
  
  mainWindow.webContents.session.on('select-serial-port', (event, portList, webContents, callback) => {
+
+    //Add listeners to handle ports being added or removed before the callback for `select-serial-port`
+    //is called.
+    mainWindow.webContents.session.on('serial-port-added', (event, port) => {
+      console.log('serial-port-added FIRED WITH', port)
+      //Optionally update portList to add the new port
+    })
+  
+    mainWindow.webContents.session.on('serial-port-removed', (event, port) => {
+      console.log('serial-port-removed FIRED WITH', port)
+      //Optionally update portList to remove the port
+    })
+
    event.preventDefault()
    if (portList && portList.length > 0) {
      callback(portList[0].portId)
@@ -16,14 +29,6 @@ function createWindow () {
    }
  })

-  mainWindow.webContents.session.on('serial-port-added', (event, port) => {
-    console.log('serial-port-added FIRED WITH', port)
-  })
-
-  mainWindow.webContents.session.on('serial-port-removed', (event, port) => {
-    console.log('serial-port-removed FIRED WITH', port)
-  })
-
  mainWindow.webContents.session.setPermissionCheckHandler((webContents, permission, requestingOrigin, details) => {
    if (permission === 'serial' && details.securityOrigin === 'file:///') {
      return true
--- a/docs/tutorial/devices.md
+++ b/docs/tutorial/devices.md
@@ -36,8 +36,10 @@ the WebHID API:
  can be used to select a HID device when a call to
  `navigator.hid.requestDevice` is made.  Additionally the [`hid-device-added`](../api/session.md#event-hid-device-added)
  and [`hid-device-removed`](../api/session.md#event-hid-device-removed) events
-  on the Session can be used to handle devices being plugged in or unplugged during the
-  `navigator.hid.requestDevice` process.
+  on the Session can be used to handle devices being plugged in or unplugged
+  when handling the `select-hid-device` event.
+  **Note:** These events only fire until the callback from `select-hid-device`
+  is called.  They are not intended to be used as a generic hid device listener.
 * [`ses.setDevicePermissionHandler(handler)`](../api/session.md#sessetdevicepermissionhandlerhandler)
  can be used to provide default permissioning to devices without first calling
  for permission to devices via `navigator.hid.requestDevice`.  Additionally,
@@ -82,8 +84,11 @@ There are several additional APIs for working with the Web Serial API:

 * The [`serial-port-added`](../api/session.md#event-serial-port-added)
  and [`serial-port-removed`](../api/session.md#event-serial-port-removed) events
-  on the Session can be used to handle devices being plugged in or unplugged during the
-  `navigator.serial.requestPort` process.
+  on the Session can be used to handle devices being plugged in or unplugged
+  when handling the `select-serial-port` event.
+  **Note:** These events only fire until the callback from `select-serial-port`
+  is called.  They are not intended to be used as a generic serial port
+  listener.
 * [`ses.setDevicePermissionHandler(handler)`](../api/session.md#sessetdevicepermissionhandlerhandler)
  can be used to provide default permissioning to devices without first calling
  for permission to devices via `navigator.serial.requestPort`.  Additionally,
--- a/docs/tutorial/electron-timelines.md
+++ b/docs/tutorial/electron-timelines.md
@@ -24,10 +24,11 @@ check out our [Electron Versioning](./electron-versioning.md) doc.
 | 14.0.0 | -- | 2021-May-27 | 2021-Aug-31 | M93 | v14.17 | 🚫 |
 | 15.0.0 | 2021-Jul-20 | 2021-Sep-01 | 2021-Sep-21 | M94 | v16.5 | 🚫 |
 | 16.0.0 | 2021-Sep-23 | 2021-Oct-20 | 2021-Nov-16 | M96 | v16.9 | 🚫 |
-| 17.0.0 | 2021-Nov-18 | 2022-Jan-06 | 2022-Feb-01 | M98 | v16.13 | ✅ |
+| 17.0.0 | 2021-Nov-18 | 2022-Jan-06 | 2022-Feb-01 | M98 | v16.13 | 🚫 |
 | 18.0.0 | 2022-Feb-03 | 2022-Mar-03 | 2022-Mar-29 | M100 | v16.13 | ✅ |
 | 19.0.0 | 2022-Mar-31 | 2022-Apr-26 | 2022-May-24 | M102 | v16.14 | ✅ |
-| 20.0.0 | 2022-May-26 | 2022-Jun-21 | 2022-Aug-02 | M104 | TBD | ✅ |
+| 20.0.0 | 2022-May-26 | 2022-Jun-21 | 2022-Aug-02 | M104 | v16.15 | ✅ |
+| 21.0.0 | 2022-Aug-04 | 2022-Aug-30 | 2022-Sep-27 | M106 | TBD | ✅ |

 **Notes:**

--- a/docs/tutorial/in-app-purchases.md
+++ b/docs/tutorial/in-app-purchases.md
@@ -116,7 +116,7 @@ inAppPurchase.getProducts(PRODUCT_IDS).then(products => {
    console.log(`The price of ${product.localizedTitle} is ${product.formattedPrice}.`)
  })

-  // Ask the user which product he/she wants to purchase.
+  // Ask the user which product they want to purchase.
  const selectedProduct = products[0]
  const selectedQuantity = 1

--- a/docs/tutorial/quick-start.md
+++ b/docs/tutorial/quick-start.md
@@ -403,7 +403,7 @@ app.on('window-all-closed', () => {
 ```js
 // preload.js

-// All of the Node.js APIs are available in the preload process.
+// All the Node.js APIs are available in the preload process.
 // It has the same sandbox as a Chrome extension.
 window.addEventListener('DOMContentLoaded', () => {
  const replaceText = (selector, text) => {
--- a/docs/tutorial/security.md
+++ b/docs/tutorial/security.md
@@ -99,7 +99,7 @@ You should at least follow these steps to improve the security of your applicati

 1. [Only load secure content](#1-only-load-secure-content)
 2. [Disable the Node.js integration in all renderers that display remote content](#2-do-not-enable-nodejs-integration-for-remote-content)
-3. [Enable context isolation in all renderers that display remote content](#3-enable-context-isolation-for-remote-content)
+3. [Enable context isolation in all renderers](#3-enable-context-isolation)
 4. [Enable process sandboxing](#4-enable-process-sandboxing)
 5. [Use `ses.setPermissionRequestHandler()` in all sessions that load remote content](#5-handle-session-permission-requests-from-remote-content)
 6. [Do not disable `webSecurity`](#6-do-not-disable-websecurity)
@@ -225,7 +225,7 @@ do consume Node.js modules or features. Preload scripts continue to have access
 to `require` and other Node.js features, allowing developers to expose a custom
 API to remotely loaded content via the [contextBridge API](../api/context-bridge.md).

-### 3. Enable Context Isolation for remote content
+### 3. Enable Context Isolation

 :::info
 This recommendation is the default behavior in Electron since 12.0.0.
--- a/docs/tutorial/tutorial-2-first-app.md
+++ b/docs/tutorial/tutorial-2-first-app.md
@@ -350,7 +350,7 @@ app.whenReady().then(() => {

 ## Optional: Debugging from VS Code

-If you want to debug your application using VS Code, you need to attach VS Code to
+If you want to debug your application using VS Code, you have need attach VS Code to
 both the main and renderer processes. Here is a sample configuration for you to
 run. Create a launch.json configuration in a new `.vscode` folder in your project:

--- a/docs/tutorial/window-customization.md
+++ b/docs/tutorial/window-customization.md
@@ -115,9 +115,9 @@ const win = new BrowserWindow({
 })
 ```

-On Windows, you can also specify the color of the overlay and its symbols by setting
-`titleBarOverlay` to an object with the `color` and `symbolColor` properties. If an option
-is not specified, the color will default to its system color for the window control buttons:
+On Windows, you can also specify additional parameters. The color of the overlay and its symbols can be specified by setting `titleBarOverlay` to an object and using the `color` and `symbolColor` properties respectively. The height of the overlay can also be specified with the `height` property.
+
+If a color option is not specified, the color will default to its system color for the window control buttons. Similarly, if the height option is not specified it will default to the default height:

 ```javascript title='main.js'
 // on Windows
@@ -126,7 +126,8 @@ const win = new BrowserWindow({
  titleBarStyle: 'hidden',
  titleBarOverlay: {
    color: '#2f3241',
-    symbolColor: '#74b1be'
+    symbolColor: '#74b1be',
+    height: 60
  }
 })
 ```
@@ -135,6 +136,10 @@ const win = new BrowserWindow({
 > color and dimension values from a renderer using a set of readonly
 > [JavaScript APIs][overlay-javascript-apis] and [CSS Environment Variables][overlay-css-env-vars].

+### Limitations
+
+* Transparent colors are currently not supported. Progress updates for this feature can be found in PR [#33567](https://github.com/electron/electron/issues/33567).
+
 ## Create transparent windows

 By setting the `transparent` option to `true`, you can make a fully transparent window.
--- a/electron_paks.gni
+++ b/electron_paks.gni
@@ -19,14 +19,12 @@ template("electron_repack_percent") {
    # All sources should also have deps for completeness.
    sources = [
      "$root_gen_dir/components/components_resources_${percent}_percent.pak",
-      "$root_gen_dir/content/app/resources/content_resources_${percent}_percent.pak",
      "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_${percent}_percent.pak",
      "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak",
    ]

    deps = [
      "//components/resources",
-      "//content/app/resources",
      "//third_party/blink/public:scaled_resources_${percent}_percent",
      "//ui/resources",
    ]
@@ -54,6 +52,8 @@ template("electron_extra_paks") {
                           ])
    output = "${invoker.output_dir}/resources.pak"
    sources = [
+      "$root_gen_dir/chrome/browser_resources.pak",
+      "$root_gen_dir/chrome/common_resources.pak",
      "$root_gen_dir/chrome/dev_ui_browser_resources.pak",
      "$root_gen_dir/components/components_resources.pak",
      "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
@@ -69,6 +69,8 @@ template("electron_extra_paks") {
    ]
    deps = [
      "//chrome/browser:dev_ui_browser_resources",
+      "//chrome/browser:resources",
+      "//chrome/common:resources",
      "//components/resources",
      "//content:content_resources",
      "//content:dev_ui_content_resources",
@@ -172,19 +174,25 @@ template("electron_paks") {
    }

    source_patterns = [
+      "${root_gen_dir}/chrome/locale_settings_",
      "${root_gen_dir}/chrome/platform_locale_settings_",
+      "${root_gen_dir}/chrome/generated_resources_",
+      "${root_gen_dir}/components/strings/components_locale_settings_",
      "${root_gen_dir}/components/strings/components_strings_",
-      "${root_gen_dir}/third_party/blink/public/strings/blink_accessibility_strings_",
-      "${root_gen_dir}/third_party/blink/public/strings/blink_strings_",
      "${root_gen_dir}/device/bluetooth/strings/bluetooth_strings_",
      "${root_gen_dir}/extensions/strings/extensions_strings_",
      "${root_gen_dir}/services/strings/services_strings_",
+      "${root_gen_dir}/third_party/blink/public/strings/blink_accessibility_strings_",
+      "${root_gen_dir}/third_party/blink/public/strings/blink_strings_",
      "${root_gen_dir}/ui/strings/app_locale_settings_",
      "${root_gen_dir}/ui/strings/ax_strings_",
      "${root_gen_dir}/ui/strings/ui_strings_",
    ]
    deps = [
+      "//chrome/app:generated_resources",
+      "//chrome/app/resources:locale_settings",
      "//chrome/app/resources:platform_locale_settings",
+      "//components/strings:components_locale_settings",
      "//components/strings:components_strings",
      "//device/bluetooth/strings",
      "//extensions/strings",
--- a/electron_resources.grd
+++ b/electron_resources.grd
@@ -11,15 +11,8 @@
    <output filename="electron_resources.pak" type="data_package" />
  </outputs>
  <release seq="1" allow_pseudo="false">
-    <messages fallback_to_english="true">
-      <!-- TODO(deepak1556): Add translations,
-           check https://www.chromium.org/developers/design-documents/ui-localization -->
-      <part file="electron_strings.grdp" />
-    </messages>
    <includes>
      <include name="IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE" file="${target_gen_dir}/shell_devtools_discovery_page.html" use_base_dir="false" type="BINDATA" />
-      <include name="IDR_PDF_MANIFEST" file="../chrome/browser/resources/pdf/manifest.json" type="BINDATA" />
-      <include name="IDR_CRYPTOTOKEN_MANIFEST" file="../chrome/browser/resources/cryptotoken/manifest.json" type="BINDATA" />
    </includes>
  </release>
 </grit>
--- a/electron_strings.grdp
+++ b/electron_strings.grdp
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<grit-part>
-  <!-- Windows Caption Buttons -->
-  <message name="IDS_APP_ACCNAME_CLOSE" desc="The accessible name for the Close button.">
-    Close
-  </message>
-  <message name="IDS_APP_ACCNAME_MINIMIZE" desc="The accessible name for the Minimize button.">
-    Minimize
-  </message>
-  <message name="IDS_APP_ACCNAME_MAXIMIZE" desc="The accessible name for the Maximize button.">
-    Maximize
-  </message>
-  <message name="IDS_APP_ACCNAME_RESTORE" desc="The accessible name for the Restore button.">
-    Restore
-  </message>
-
-  <!-- Printing Service -->
-  <message name="IDS_UTILITY_PROCESS_PRINTING_SERVICE_NAME" desc="The name of the utility process used for printing conversions.">
-    Printing Service
-  </message>
-  <message name="IDS_PRINT_INVALID_PRINTER_SETTINGS" desc="Message to display when selected printer is not reachable or its settings are invalid.">
-    The selected printer is not available or not installed correctly. <ph name="BR">&lt;br&gt;</ph> Check your printer or try selecting another printer.
-  </message>
-  <message name="IDS_DEFAULT_PRINT_DOCUMENT_TITLE" desc="Default title for a print document">
-    Untitled Document
-  </message>
-  <message name="IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME" desc="The name of the utility process used for backend interactions with printer drivers.">
-    Print Backend Service
-  </message>
-
-  <!-- Desktop Capturer API -->
-  <message name="IDS_DESKTOP_MEDIA_PICKER_SINGLE_SCREEN_NAME" desc="Name for screens in the desktop media picker UI when there is only one monitor.">
-    Entire Screen
-  </message>
-  <message name="IDS_DESKTOP_MEDIA_PICKER_MULTIPLE_SCREEN_NAME" desc="Name for screens in the desktop media picker UI when there are multiple monitors.">
-    {SCREEN_INDEX, plural, =1{Screen #} other{Screen #}}
-  </message>
-
-  <!-- File Select Helper-->
-  <message name="IDS_IMAGE_FILES" desc="The description of the image file extensions in the select file dialog.">
-    Image Files
-  </message>
-  <message name="IDS_AUDIO_FILES" desc="The description of the audio file extensions in the select file dialog.">
-    Audio Files
-  </message>
-  <message name="IDS_VIDEO_FILES" desc="The description of the video file extensions in the select file dialog.">
-    Video Files
-  </message>
-  <message name="IDS_CUSTOM_FILES" desc="The description of the custom file extensions in the select file dialog.">
-    Custom Files
-  </message>
-  <message name="IDS_DEFAULT_DOWNLOAD_FILENAME" desc="Default name for downloaded files when we have no idea what they could be.">
-    download
-  </message>
-
-  <!-- Picture-in-Picture -->
-  <if expr="is_macosx">
-    <message name="IDS_PICTURE_IN_PICTURE_TITLE_TEXT" desc="Title of the Picture-in-Picture window. This appears in the system tray and window header.">
-      Picture in Picture
-    </message>
-  </if>
-  <if expr="not is_macosx">
-    <message name="IDS_PICTURE_IN_PICTURE_TITLE_TEXT" desc="Title of the Picture-in-Picture window. This appears in the system tray and window header.">
-      Picture in picture
-    </message>
-  </if>
-  <message name="IDS_PICTURE_IN_PICTURE_PAUSE_CONTROL_TEXT" desc="Text label of the pause control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently playing.">
-    Pause
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_PLAY_CONTROL_TEXT" desc="Text label of the play control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently paused.">
-    Play
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_REPLAY_CONTROL_TEXT" desc="Text label of the replay control button. The button appears when the user hovers over the Picture-in-Picture window and the video is ended.">
-    Play from the beginning
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_BACK_TO_TAB_CONTROL_TEXT" desc="Text label of the back to tab control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Back to video player
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_MUTE_CONTROL_TEXT" desc="Text label of the mute control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently unmuted.">
-    Mute
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_UNMUTE_CONTROL_TEXT" desc="Text label of the mute control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently muted.">
-    Unmute
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_SKIP_AD_CONTROL_TEXT" desc="Text label of the skip ad control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Skip Ad
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_MUTE_MICROPHONE_TEXT" desc="Text label of the mute microphone control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Mute microphone
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_UNMUTE_MICROPHONE_TEXT" desc="Text label of the unmute microphone control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Unmute microphone
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_TURN_ON_CAMERA_TEXT" desc="Text label of the turn on camera control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Turn on camera
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_TURN_OFF_CAMERA_TEXT" desc="Text label of the turn off camera control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Turn off camera
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_HANG_UP_TEXT" desc="Text label of the hang up control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Hang up
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_CLOSE_CONTROL_TEXT" desc="Text label of the close control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Close
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_RESIZE_HANDLE_TEXT" desc="Text label of the resize handle. The button appears when the user hovers over the Picture-in-Picture window.">
-    Resize
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_PLAY_PAUSE_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button toggles between play and pause controls.">
-    Toggle video to play or pause
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_MUTE_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button toggles mute state.">
-    Toggle mute
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_NEXT_TRACK_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button invokes next track action.">
-    Next track
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_PREVIOUS_TRACK_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button invokes previous track action.">
-    Previous track
-  </message>
-  <message name="IDS_SPELLCHECK_DICTIONARY" use_name_for_id="true">
-    en-US
-  </message>
-  <message name="IDS_ACCEPT_LANGUAGES" use_name_for_id="true">
-    en-US,en
-  </message>
-  <if expr="is_win">
-    <message name="IDS_UTILITY_PROCESS_UTILITY_WIN_NAME" desc="The name of the utility process used to handle Windows utility operations.">
-      Windows Utilities
-    </message>
-  </if>
-  <message name="IDS_DOWNLOAD_MORE_ACTIONS"
-          desc="Tooltip of a button on the downloads page that shows a menu with actions like 'Open downloads folder' or 'Clear all'">
-    More actions
-  </message>
-  <!-- Badging -->
-  <message name="IDS_SATURATED_BADGE_CONTENT" desc="The content to display when the application's badge is too large to display to indicate that the badge is more than a given maximum. This string should be as short as possible, preferably only one character beyond the content">
-    <ph name="MAXIMUM_VALUE">$1<ex>99</ex></ph>+
-  </message>
-  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS_SATURATED" desc="The accessibility text which will be read by a screen reader when the notification count is too large to display (e.g. greater than 99).">
-    {MAX_UNREAD_NOTIFICATIONS, plural, =1 {More than 1 unread notification} other {More than # unread notifications}}
-  </message>
-  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS_UNSPECIFIED" desc="The accessibility text which will be read by a screen reader when there are some unspecified number of notifications, or user attention is required">
-    Unread Notifications
-  </message>
-  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS" desc="The accessibility text which will be read by a screen reader when there are notifcatications">
-    {UNREAD_NOTIFICATIONS, plural, =1 {1 Unread Notification} other {# Unread Notifications}}
-  </message>
-  <message name="IDS_HID_CHOOSER_ITEM_WITHOUT_NAME" desc="User option displaying the device IDs for a Human Interface Device (HID) without a device name.">
-        Unknown Device (<ph name="DEVICE_ID">$1<ex>1234:abcd</ex></ph>) </message>
-  <if expr="is_win">
-    <then>
-      <message name="IDS_AX_UNLABELED_IMAGE_ROLE_DESCRIPTION" desc="Accessibility role description for a graphic (image) on a web page or PDF that does not have a description for blind users." is_accessibility_with_no_ui="true">
-        Unlabeled graphic
-      </message>
-    </then>
-    <else>
-      <message name="IDS_AX_UNLABELED_IMAGE_ROLE_DESCRIPTION" desc="Accessibility role description for an image on a web page or PDF that does not have a description for blind users." is_accessibility_with_no_ui="true">
-        Unlabeled image
-      </message>
-    </else>
-  </if>
-</grit-part>
--- a/filenames.gni
+++ b/filenames.gni
@@ -108,6 +108,8 @@ filenames = {
    "shell/browser/ui/win/notify_icon.h",
    "shell/browser/ui/win/taskbar_host.cc",
    "shell/browser/ui/win/taskbar_host.h",
+    "shell/browser/win/dark_mode.cc",
+    "shell/browser/win/dark_mode.h",
    "shell/browser/win/scoped_hstring.cc",
    "shell/browser/win/scoped_hstring.h",
    "shell/common/api/electron_api_native_image_win.cc",
@@ -168,6 +170,8 @@ filenames = {
    "shell/browser/ui/cocoa/electron_native_widget_mac.mm",
    "shell/browser/ui/cocoa/electron_ns_window_delegate.h",
    "shell/browser/ui/cocoa/electron_ns_window_delegate.mm",
+    "shell/browser/ui/cocoa/electron_ns_panel.h",
+    "shell/browser/ui/cocoa/electron_ns_panel.mm",
    "shell/browser/ui/cocoa/electron_ns_window.h",
    "shell/browser/ui/cocoa/electron_ns_window.mm",
    "shell/browser/ui/cocoa/electron_preview_item.h",
@@ -569,6 +573,7 @@ filenames = {
    "shell/common/gin_converters/gfx_converter.h",
    "shell/common/gin_converters/guid_converter.h",
    "shell/common/gin_converters/gurl_converter.h",
+    "shell/common/gin_converters/hid_device_info_converter.h",
    "shell/common/gin_converters/image_converter.cc",
    "shell/common/gin_converters/image_converter.h",
    "shell/common/gin_converters/message_box_converter.cc",
--- a/filenames.libcxx.gni
+++ b/filenames.libcxx.gni
@@ -1,49 +1,376 @@
 libcxx_headers = [
  "//buildtools/third_party/libc++/trunk/include/CMakeLists.txt",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/adjacent_find.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/all_of.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/any_of.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/binary_search.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/clamp.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/comp.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/comp_ref_type.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/copy_backward.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/copy_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/copy_n.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/count.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/count_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/equal.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/equal_range.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/fill.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/fill_n.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/find.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/find_end.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/find_first_of.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/find_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/find_if_not.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/for_each.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/for_each_n.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/generate.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/generate_n.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/half_positive.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_found_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_fun_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_in_out_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_in_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_out_out_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_out_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/includes.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/inplace_merge.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/is_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/is_heap_until.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/is_partitioned.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/is_permutation.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/is_sorted.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/is_sorted_until.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/iter_swap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/lexicographical_compare.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/lower_bound.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/make_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/max.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/max_element.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/merge.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/min.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/min_element.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/min_max_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/minmax.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/minmax_element.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/mismatch.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/move.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/move_backward.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/next_permutation.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/none_of.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/nth_element.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/partial_sort.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/partial_sort_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/partition.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/partition_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/partition_point.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pop_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/prev_permutation.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/push_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_find.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_find_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_find_if_not.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_max_element.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_min.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_min_element.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_mismatch.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_swap_ranges.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/remove.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/remove_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/remove_copy_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/remove_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/replace.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/replace_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/replace_copy_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/replace_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/reverse.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/reverse_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/rotate.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/rotate_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/sample.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/search.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/search_n.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/set_difference.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/set_intersection.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/set_symmetric_difference.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/set_union.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/shift_left.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/shift_right.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/shuffle.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/sift_down.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/sort.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/sort_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/stable_partition.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/stable_sort.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/swap_ranges.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/transform.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/unique.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/unique_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/unwrap_iter.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/upper_bound.h",
+  "//buildtools/third_party/libc++/trunk/include/__assert",
  "//buildtools/third_party/libc++/trunk/include/__availability",
+  "//buildtools/third_party/libc++/trunk/include/__bit/bit_cast.h",
+  "//buildtools/third_party/libc++/trunk/include/__bit/byteswap.h",
  "//buildtools/third_party/libc++/trunk/include/__bit_reference",
  "//buildtools/third_party/libc++/trunk/include/__bits",
  "//buildtools/third_party/libc++/trunk/include/__bsd_locale_defaults.h",
  "//buildtools/third_party/libc++/trunk/include/__bsd_locale_fallbacks.h",
+  "//buildtools/third_party/libc++/trunk/include/__charconv/chars_format.h",
+  "//buildtools/third_party/libc++/trunk/include/__charconv/from_chars_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__charconv/to_chars_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/calendar.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/convert_to_timespec.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/duration.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/file_clock.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/high_resolution_clock.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/steady_clock.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/system_clock.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/time_point.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/common_comparison_category.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/compare_partial_order_fallback.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/compare_strong_order_fallback.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/compare_three_way.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/compare_three_way_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/compare_weak_order_fallback.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/is_eq.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/ordering.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/partial_order.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/strong_order.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/synth_three_way.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/three_way_comparable.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/weak_order.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/arithmetic.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/assignable.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/boolean_testable.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/class_or_enum.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/common_reference_with.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/common_with.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/constructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/convertible_to.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/copyable.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/derived_from.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/destructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/different_from.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/equality_comparable.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/invocable.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/movable.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/predicate.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/regular.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/relation.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/same_as.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/semiregular.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/swappable.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/totally_ordered.h",
  "//buildtools/third_party/libc++/trunk/include/__config",
  "//buildtools/third_party/libc++/trunk/include/__config_site.in",
+  "//buildtools/third_party/libc++/trunk/include/__coroutine/coroutine_handle.h",
+  "//buildtools/third_party/libc++/trunk/include/__coroutine/coroutine_traits.h",
+  "//buildtools/third_party/libc++/trunk/include/__coroutine/noop_coroutine_handle.h",
+  "//buildtools/third_party/libc++/trunk/include/__coroutine/trivial_awaitables.h",
  "//buildtools/third_party/libc++/trunk/include/__debug",
  "//buildtools/third_party/libc++/trunk/include/__errc",
-  "//buildtools/third_party/libc++/trunk/include/__functional_03",
-  "//buildtools/third_party/libc++/trunk/include/__functional_base",
-  "//buildtools/third_party/libc++/trunk/include/__functional_base_03",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/copy_options.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/directory_entry.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/directory_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/directory_options.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/file_status.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/file_time_type.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/file_type.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/filesystem_error.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/operations.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/path.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/path_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/perm_options.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/perms.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/recursive_directory_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/space_info.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/u8path.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/format_arg.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/format_args.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/format_context.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/format_error.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/format_fwd.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/format_parse_context.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/format_string.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/format_to_n_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/formatter.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/formatter_bool.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/formatter_char.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/formatter_floating_point.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/formatter_integer.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/formatter_integral.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/formatter_pointer.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/formatter_string.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/parser_std_format_spec.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/binary_function.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/binary_negate.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/bind.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/bind_back.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/bind_front.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/binder1st.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/binder2nd.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/compose.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/default_searcher.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/function.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/hash.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/identity.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/invoke.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/is_transparent.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/mem_fn.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/mem_fun_ref.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/not_fn.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/operations.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/perfect_forward.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/pointer_to_binary_function.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/pointer_to_unary_function.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/ranges_operations.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/reference_wrapper.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/unary_function.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/unary_negate.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/unwrap_ref.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/weak_result_type.h",
  "//buildtools/third_party/libc++/trunk/include/__hash_table",
+  "//buildtools/third_party/libc++/trunk/include/__ios/fpos.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/access.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/advance.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/back_insert_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/common_iterator.h",
  "//buildtools/third_party/libc++/trunk/include/__iterator/concepts.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/counted_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/data.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/default_sentinel.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/distance.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/empty.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/erase_if_container.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/front_insert_iterator.h",
  "//buildtools/third_party/libc++/trunk/include/__iterator/incrementable_traits.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/indirectly_comparable.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/insert_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/istream_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/istreambuf_iterator.h",
  "//buildtools/third_party/libc++/trunk/include/__iterator/iter_move.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/iter_swap.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/iterator.h",
  "//buildtools/third_party/libc++/trunk/include/__iterator/iterator_traits.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/mergeable.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/move_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/next.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/ostream_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/ostreambuf_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/permutable.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/prev.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/projected.h",
  "//buildtools/third_party/libc++/trunk/include/__iterator/readable_traits.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/reverse_access.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/reverse_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/size.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/sortable.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/unreachable_sentinel.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/wrap_iter.h",
  "//buildtools/third_party/libc++/trunk/include/__libcpp_version",
  "//buildtools/third_party/libc++/trunk/include/__locale",
+  "//buildtools/third_party/libc++/trunk/include/__mbstate_t.h",
  "//buildtools/third_party/libc++/trunk/include/__memory/addressof.h",
  "//buildtools/third_party/libc++/trunk/include/__memory/allocation_guard.h",
  "//buildtools/third_party/libc++/trunk/include/__memory/allocator.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/allocator_arg_t.h",
  "//buildtools/third_party/libc++/trunk/include/__memory/allocator_traits.h",
  "//buildtools/third_party/libc++/trunk/include/__memory/auto_ptr.h",
  "//buildtools/third_party/libc++/trunk/include/__memory/compressed_pair.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/concepts.h",
  "//buildtools/third_party/libc++/trunk/include/__memory/construct_at.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/pointer_safety.h",
  "//buildtools/third_party/libc++/trunk/include/__memory/pointer_traits.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/ranges_construct_at.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/ranges_uninitialized_algorithms.h",
  "//buildtools/third_party/libc++/trunk/include/__memory/raw_storage_iterator.h",
  "//buildtools/third_party/libc++/trunk/include/__memory/shared_ptr.h",
  "//buildtools/third_party/libc++/trunk/include/__memory/temporary_buffer.h",
  "//buildtools/third_party/libc++/trunk/include/__memory/uninitialized_algorithms.h",
  "//buildtools/third_party/libc++/trunk/include/__memory/unique_ptr.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/uses_allocator.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/voidify.h",
  "//buildtools/third_party/libc++/trunk/include/__mutex_base",
  "//buildtools/third_party/libc++/trunk/include/__node_handle",
-  "//buildtools/third_party/libc++/trunk/include/__nullptr",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/accumulate.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/adjacent_difference.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/exclusive_scan.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/gcd_lcm.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/inclusive_scan.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/inner_product.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/iota.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/midpoint.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/partial_sum.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/reduce.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/transform_exclusive_scan.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/transform_inclusive_scan.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/transform_reduce.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/bernoulli_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/binomial_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/cauchy_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/chi_squared_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/clamp_to_integral.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/default_random_engine.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/discard_block_engine.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/discrete_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/exponential_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/extreme_value_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/fisher_f_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/gamma_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/generate_canonical.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/geometric_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/independent_bits_engine.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/is_seed_sequence.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/is_valid.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/knuth_b.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/linear_congruential_engine.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/log2.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/lognormal_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/mersenne_twister_engine.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/negative_binomial_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/normal_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/piecewise_constant_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/piecewise_linear_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/poisson_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/random_device.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/ranlux.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/seed_seq.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/shuffle_order_engine.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/student_t_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/subtract_with_carry_engine.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/uniform_int_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/uniform_random_bit_generator.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/uniform_real_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/weibull_distribution.h",
  "//buildtools/third_party/libc++/trunk/include/__ranges/access.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/all.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/common_view.h",
  "//buildtools/third_party/libc++/trunk/include/__ranges/concepts.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/copyable_box.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/counted.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/dangling.h",
  "//buildtools/third_party/libc++/trunk/include/__ranges/data.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/drop_view.h",
  "//buildtools/third_party/libc++/trunk/include/__ranges/empty.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/empty_view.h",
  "//buildtools/third_party/libc++/trunk/include/__ranges/enable_borrowed_range.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/enable_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/iota_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/join_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/non_propagating_cache.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/owning_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/range_adaptor.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/rbegin.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/ref_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/rend.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/reverse_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/single_view.h",
  "//buildtools/third_party/libc++/trunk/include/__ranges/size.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/subrange.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/take_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/transform_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/view_interface.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/views.h",
  "//buildtools/third_party/libc++/trunk/include/__split_buffer",
  "//buildtools/third_party/libc++/trunk/include/__std_stream",
  "//buildtools/third_party/libc++/trunk/include/__string",
@@ -51,14 +378,12 @@ libcxx_headers = [
  "//buildtools/third_party/libc++/trunk/include/__support/fuchsia/xlocale.h",
  "//buildtools/third_party/libc++/trunk/include/__support/ibm/gettod_zos.h",
  "//buildtools/third_party/libc++/trunk/include/__support/ibm/limits.h",
-  "//buildtools/third_party/libc++/trunk/include/__support/ibm/locale_mgmt_aix.h",
  "//buildtools/third_party/libc++/trunk/include/__support/ibm/locale_mgmt_zos.h",
  "//buildtools/third_party/libc++/trunk/include/__support/ibm/nanosleep.h",
  "//buildtools/third_party/libc++/trunk/include/__support/ibm/support.h",
  "//buildtools/third_party/libc++/trunk/include/__support/ibm/xlocale.h",
  "//buildtools/third_party/libc++/trunk/include/__support/musl/xlocale.h",
  "//buildtools/third_party/libc++/trunk/include/__support/newlib/xlocale.h",
-  "//buildtools/third_party/libc++/trunk/include/__support/nuttx/xlocale.h",
  "//buildtools/third_party/libc++/trunk/include/__support/openbsd/xlocale.h",
  "//buildtools/third_party/libc++/trunk/include/__support/solaris/floatingpoint.h",
  "//buildtools/third_party/libc++/trunk/include/__support/solaris/wchar.h",
@@ -68,11 +393,30 @@ libcxx_headers = [
  "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__nop_locale_mgmt.h",
  "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__posix_l_fallback.h",
  "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__strtonum_fallback.h",
+  "//buildtools/third_party/libc++/trunk/include/__thread/poll_with_backoff.h",
+  "//buildtools/third_party/libc++/trunk/include/__thread/timed_backoff_policy.h",
  "//buildtools/third_party/libc++/trunk/include/__threading_support",
  "//buildtools/third_party/libc++/trunk/include/__tree",
  "//buildtools/third_party/libc++/trunk/include/__tuple",
  "//buildtools/third_party/libc++/trunk/include/__undef_macros",
+  "//buildtools/third_party/libc++/trunk/include/__utility/as_const.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/auto_cast.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/cmp.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/declval.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/exchange.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/forward.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/in_place.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/integer_sequence.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/move.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/pair.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/piecewise_construct.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/priority_tag.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/rel_ops.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/swap.h",
  "//buildtools/third_party/libc++/trunk/include/__utility/to_underlying.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/transaction.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/unreachable.h",
+  "//buildtools/third_party/libc++/trunk/include/__variant/monostate.h",
  "//buildtools/third_party/libc++/trunk/include/algorithm",
  "//buildtools/third_party/libc++/trunk/include/any",
  "//buildtools/third_party/libc++/trunk/include/array",
@@ -99,6 +443,7 @@ libcxx_headers = [
  "//buildtools/third_party/libc++/trunk/include/complex.h",
  "//buildtools/third_party/libc++/trunk/include/concepts",
  "//buildtools/third_party/libc++/trunk/include/condition_variable",
+  "//buildtools/third_party/libc++/trunk/include/coroutine",
  "//buildtools/third_party/libc++/trunk/include/csetjmp",
  "//buildtools/third_party/libc++/trunk/include/csignal",
  "//buildtools/third_party/libc++/trunk/include/cstdarg",
@@ -111,6 +456,7 @@ libcxx_headers = [
  "//buildtools/third_party/libc++/trunk/include/ctgmath",
  "//buildtools/third_party/libc++/trunk/include/ctime",
  "//buildtools/third_party/libc++/trunk/include/ctype.h",
+  "//buildtools/third_party/libc++/trunk/include/cuchar",
  "//buildtools/third_party/libc++/trunk/include/cwchar",
  "//buildtools/third_party/libc++/trunk/include/cwctype",
  "//buildtools/third_party/libc++/trunk/include/deque",
@@ -122,7 +468,6 @@ libcxx_headers = [
  "//buildtools/third_party/libc++/trunk/include/experimental/algorithm",
  "//buildtools/third_party/libc++/trunk/include/experimental/coroutine",
  "//buildtools/third_party/libc++/trunk/include/experimental/deque",
-  "//buildtools/third_party/libc++/trunk/include/experimental/filesystem",
  "//buildtools/third_party/libc++/trunk/include/experimental/forward_list",
  "//buildtools/third_party/libc++/trunk/include/experimental/functional",
  "//buildtools/third_party/libc++/trunk/include/experimental/iterator",
@@ -205,6 +550,7 @@ libcxx_headers = [
  "//buildtools/third_party/libc++/trunk/include/type_traits",
  "//buildtools/third_party/libc++/trunk/include/typeindex",
  "//buildtools/third_party/libc++/trunk/include/typeinfo",
+  "//buildtools/third_party/libc++/trunk/include/uchar.h",
  "//buildtools/third_party/libc++/trunk/include/unordered_map",
  "//buildtools/third_party/libc++/trunk/include/unordered_set",
  "//buildtools/third_party/libc++/trunk/include/utility",
--- a/lib/browser/api/native-theme.ts
+++ b/lib/browser/api/native-theme.ts
@@ -1,3 +1,3 @@
-const { nativeTheme } = process._linkedBinding('electron_common_native_theme');
+const { nativeTheme } = process._linkedBinding('electron_browser_native_theme');

 module.exports = nativeTheme;
--- a/lib/browser/api/net.ts
+++ b/lib/browser/api/net.ts
@@ -36,17 +36,14 @@ const discardableDuplicateHeaders = new Set([
 ]);

 class IncomingMessage extends Readable {
-  _shouldPush: boolean;
-  _data: (Buffer | null)[];
+  _shouldPush: boolean = false;
+  _data: (Buffer | null)[] = [];
  _responseHead: NodeJS.ResponseHead;
-  _resume: (() => void) | null;
+  _resume: (() => void) | null = null;

  constructor (responseHead: NodeJS.ResponseHead) {
    super();
-    this._shouldPush = false;
-    this._data = [];
    this._responseHead = responseHead;
-    this._resume = null;
  }

  get statusCode () {
--- a/lib/browser/api/notification.ts
+++ b/lib/browser/api/notification.ts
@@ -1,7 +1,7 @@
 const {
  Notification: ElectronNotification,
  isSupported
-} = process._linkedBinding('electron_common_notification');
+} = process._linkedBinding('electron_browser_notification');

 ElectronNotification.isSupported = isSupported;

--- a/lib/browser/api/screen.ts
+++ b/lib/browser/api/screen.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';

-const { createScreen } = process._linkedBinding('electron_common_screen');
+const { createScreen } = process._linkedBinding('electron_browser_screen');

 let _screen: Electron.Screen;

--- a/lib/browser/guest-view-manager.ts
+++ b/lib/browser/guest-view-manager.ts
@@ -7,7 +7,7 @@ import { webViewEvents } from '@electron/internal/browser/web-view-events';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';

 interface GuestInstance {
-  elementInstanceId?: number;
+  elementInstanceId: number;
  visibilityState?: VisibilityState;
  embedder: Electron.WebContents;
  guest: Electron.WebContents;
@@ -46,6 +46,7 @@ function makeWebPreferences (embedder: Electron.WebContents, params: Record<stri
    webSecurity: !params.disablewebsecurity,
    enableBlinkFeatures: params.blinkfeatures,
    disableBlinkFeatures: params.disableblinkfeatures,
+    partition: params.partition,
    ...parsedWebPreferences
  };

@@ -87,14 +88,26 @@ function makeLoadURLOptions (params: Record<string, any>) {

 // Create a new guest instance.
 const createGuest = function (embedder: Electron.WebContents, embedderFrameId: number, elementInstanceId: number, params: Record<string, any>) {
+  const webPreferences = makeWebPreferences(embedder, params);
+  const event = eventBinding.createWithSender(embedder);
+
+  const { instanceId } = params;
+
+  embedder.emit('will-attach-webview', event, webPreferences, params);
+  if (event.defaultPrevented) {
+    return -1;
+  }
+
  // eslint-disable-next-line no-undef
  const guest = (webContents as typeof ElectronInternal.WebContents).create({
+    ...webPreferences,
    type: 'webview',
-    partition: params.partition,
    embedder
  });
+
  const guestInstanceId = guest.id;
  guestInstances.set(guestInstanceId, {
+    elementInstanceId,
    guest,
    embedder
  });
@@ -108,11 +121,8 @@ const createGuest = function (embedder: Electron.WebContents, embedderFrameId: n

  // Init guest web view after attached.
  guest.once('did-attach' as any, function (this: Electron.WebContents, event: Electron.Event) {
-    const params = this.attachParams!;
-    delete this.attachParams;
-
    const previouslyAttached = this.viewInstanceId != null;
-    this.viewInstanceId = params.instanceId;
+    this.viewInstanceId = instanceId;

    // Only load URL and set size on first attach
    if (previouslyAttached) {
@@ -120,7 +130,7 @@ const createGuest = function (embedder: Electron.WebContents, embedderFrameId: n
    }

    if (params.src) {
-      this.loadURL(params.src, params.opts);
+      this.loadURL(params.src, makeLoadURLOptions(params));
    }
    embedder.emit('did-attach-webview', event, guest);
  });
@@ -173,78 +183,25 @@ const createGuest = function (embedder: Electron.WebContents, embedderFrameId: n
    }
  });

-  if (attachGuest(embedder, embedderFrameId, elementInstanceId, guestInstanceId, params)) {
-    return guestInstanceId;
-  }
-
-  return -1;
-};
-
-// Attach the guest to an element of embedder.
-const attachGuest = function (embedder: Electron.WebContents, embedderFrameId: number, elementInstanceId: number, guestInstanceId: number, params: Record<string, any>) {
  // Destroy the old guest when attaching.
  const key = `${embedder.id}-${elementInstanceId}`;
  const oldGuestInstanceId = embedderElementsMap.get(key);
  if (oldGuestInstanceId != null) {
-    // Reattachment to the same guest is just a no-op.
-    if (oldGuestInstanceId === guestInstanceId) {
-      return false;
-    }
-
    const oldGuestInstance = guestInstances.get(oldGuestInstanceId);
    if (oldGuestInstance) {
      oldGuestInstance.guest.detachFromOuterFrame();
    }
  }

-  const guestInstance = guestInstances.get(guestInstanceId);
-  // If this isn't a valid guest instance then do nothing.
-  if (!guestInstance) {
-    console.error(new Error(`Guest attach failed: Invalid guestInstanceId ${guestInstanceId}`));
-    return false;
-  }
-  const { guest } = guestInstance;
-  if (guest.hostWebContents !== embedder) {
-    console.error(new Error(`Guest attach failed: Access denied to guestInstanceId ${guestInstanceId}`));
-    return false;
-  }
-
-  const { instanceId } = params;
-
-  // If this guest is already attached to an element then remove it
-  if (guestInstance.elementInstanceId) {
-    const oldKey = `${guestInstance.embedder.id}-${guestInstance.elementInstanceId}`;
-    embedderElementsMap.delete(oldKey);
-
-    // Remove guest from embedder if moving across web views
-    if (guest.viewInstanceId !== instanceId) {
-      webViewManager.removeGuest(guestInstance.embedder, guestInstanceId);
-      guestInstance.embedder._sendInternal(`${IPC_MESSAGES.GUEST_VIEW_INTERNAL_DESTROY_GUEST}-${guest.viewInstanceId}`);
-    }
-  }
-
-  const webPreferences = makeWebPreferences(embedder, params);
-
-  const event = eventBinding.createWithSender(embedder);
-  embedder.emit('will-attach-webview', event, webPreferences, params);
-  if (event.defaultPrevented) {
-    if (guest.viewInstanceId == null) guest.viewInstanceId = instanceId;
-    guest.destroy();
-    return false;
-  }
-
-  guest.attachParams = { instanceId, src: params.src, opts: makeLoadURLOptions(params) };
  embedderElementsMap.set(key, guestInstanceId);
-
  guest.setEmbedder(embedder);
-  guestInstance.embedder = embedder;
-  guestInstance.elementInstanceId = elementInstanceId;

  watchEmbedder(embedder);

  webViewManager.addGuest(guestInstanceId, embedder, guest, webPreferences);
  guest.attachToIframe(embedder, embedderFrameId);
-  return true;
+
+  return guestInstanceId;
 };

 // Remove an guest-embedder relationship.
--- a/lib/browser/guest-window-manager.ts
+++ b/lib/browser/guest-window-manager.ts
@@ -5,7 +5,7 @@
 * out-of-process (cross-origin) are created here. "Embedder" roughly means
 * "parent."
 */
-import { BrowserWindow } from 'electron/main';
+import { BrowserWindow, deprecate } from 'electron/main';
 import type { BrowserWindowConstructorOptions, Referrer, WebContents, LoadURLOptions } from 'electron/main';
 import { parseFeatures } from '@electron/internal/browser/parse-features-string';

@@ -41,7 +41,7 @@ export function openGuestWindow ({ event, embedder, guest, referrer, disposition
  outlivesOpener: boolean,
 }): BrowserWindow | undefined {
  const { url, frameName, features } = windowOpenArgs;
-  const { options: browserWindowOptions } = makeBrowserWindowOptions({
+  const browserWindowOptions = makeBrowserWindowOptions({
    embedder,
    features,
    overrideOptions: overrideBrowserWindowOptions
@@ -155,6 +155,10 @@ function emitDeprecatedNewWindowEvent ({ event, embedder, guest, windowOpenArgs,
    ...parseContentTypeFormat(postData)
  } : null;

+  if (embedder.listenerCount('new-window') > 0) {
+    deprecate.log('The new-window event is deprecated and will be removed. Please use contents.setWindowOpenHandler() instead.');
+  }
+
  embedder.emit(
    'new-window',
    event,
@@ -211,23 +215,21 @@ function makeBrowserWindowOptions ({ embedder, features, overrideOptions }: {
  const { options: parsedOptions, webPreferences: parsedWebPreferences } = parseFeatures(features);

  return {
-    options: {
-      show: true,
-      width: 800,
-      height: 600,
-      ...parsedOptions,
-      ...overrideOptions,
-      // Note that for normal code path an existing WebContents created by
-      // Chromium will be used, with web preferences parsed in the
-      // |-will-add-new-contents| event.
-      // The |webPreferences| here is only used by the |new-window| event.
-      webPreferences: makeWebPreferences({
-        embedder,
-        insecureParsedWebPreferences: parsedWebPreferences,
-        secureOverrideWebPreferences: overrideOptions && overrideOptions.webPreferences
-      })
-    } as Electron.BrowserViewConstructorOptions
-  };
+    show: true,
+    width: 800,
+    height: 600,
+    ...parsedOptions,
+    ...overrideOptions,
+    // Note that for normal code path an existing WebContents created by
+    // Chromium will be used, with web preferences parsed in the
+    // |-will-add-new-contents| event.
+    // The |webPreferences| here is only used by the |new-window| event.
+    webPreferences: makeWebPreferences({
+      embedder,
+      insecureParsedWebPreferences: parsedWebPreferences,
+      secureOverrideWebPreferences: overrideOptions && overrideOptions.webPreferences
+    })
+  } as Electron.BrowserViewConstructorOptions;
 }

 export function makeWebPreferences ({ embedder, secureOverrideWebPreferences = {}, insecureParsedWebPreferences: parsedWebPreferences = {} }: {
--- a/lib/browser/rpc-server.ts
+++ b/lib/browser/rpc-server.ts
@@ -68,6 +68,10 @@ ipcMainUtils.handleSync(IPC_MESSAGES.BROWSER_SANDBOX_LOAD, async function (event
  };
 });

+ipcMainUtils.handleSync(IPC_MESSAGES.BROWSER_NONSANDBOX_LOAD, function (event) {
+  return { preloadPaths: event.sender._getPreloadPaths() };
+});
+
 ipcMainInternal.on(IPC_MESSAGES.BROWSER_PRELOAD_ERROR, function (event, preloadPath: string, error: Error) {
  event.sender.emit('preload-error', event, preloadPath, error);
 });
--- a/lib/common/ipc-messages.ts
+++ b/lib/common/ipc-messages.ts
@@ -3,12 +3,12 @@ export const enum IPC_MESSAGES {
  BROWSER_GET_LAST_WEB_PREFERENCES = 'BROWSER_GET_LAST_WEB_PREFERENCES',
  BROWSER_PRELOAD_ERROR = 'BROWSER_PRELOAD_ERROR',
  BROWSER_SANDBOX_LOAD = 'BROWSER_SANDBOX_LOAD',
+  BROWSER_NONSANDBOX_LOAD = 'BROWSER_NONSANDBOX_LOAD',
  BROWSER_WINDOW_CLOSE = 'BROWSER_WINDOW_CLOSE',
  BROWSER_GET_PROCESS_MEMORY_INFO = 'BROWSER_GET_PROCESS_MEMORY_INFO',

  GUEST_INSTANCE_VISIBILITY_CHANGE = 'GUEST_INSTANCE_VISIBILITY_CHANGE',

-  GUEST_VIEW_INTERNAL_DESTROY_GUEST = 'GUEST_VIEW_INTERNAL_DESTROY_GUEST',
  GUEST_VIEW_INTERNAL_DISPATCH_EVENT = 'GUEST_VIEW_INTERNAL_DISPATCH_EVENT',

  GUEST_VIEW_MANAGER_CREATE_AND_ATTACH_GUEST = 'GUEST_VIEW_MANAGER_CREATE_AND_ATTACH_GUEST',
--- a/lib/renderer/init.ts
+++ b/lib/renderer/init.ts
@@ -2,6 +2,7 @@ import * as path from 'path';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';

 import type * as ipcRendererInternalModule from '@electron/internal/renderer/ipc-renderer-internal';
+import type * as ipcRendererUtilsModule from '@electron/internal/renderer/ipc-renderer-internal-utils';

 const Module = require('module');

@@ -38,6 +39,7 @@ require('../common/reset-search-paths');
 require('@electron/internal/common/init');

 const { ipcRendererInternal } = require('@electron/internal/renderer/ipc-renderer-internal') as typeof ipcRendererInternalModule;
+const ipcRendererUtils = require('@electron/internal/renderer/ipc-renderer-internal-utils') as typeof ipcRendererUtilsModule;

 process.getProcessMemoryInfo = () => {
  return ipcRendererInternal.invoke<Electron.ProcessMemoryInfo>(IPC_MESSAGES.BROWSER_GET_PROCESS_MEMORY_INFO);
@@ -48,15 +50,8 @@ const { hasSwitch, getSwitchValue } = process._linkedBinding('electron_common_co
 const { mainFrame } = process._linkedBinding('electron_renderer_web_frame');

 const nodeIntegration = mainFrame.getWebPreference('nodeIntegration');
-const preloadScript = mainFrame.getWebPreference('preload');
-const preloadScripts = mainFrame.getWebPreference('preloadScripts');
 const appPath = hasSwitch('app-path') ? getSwitchValue('app-path') : null;

-// The webContents preload script is loaded after the session preload scripts.
-if (preloadScript) {
-  preloadScripts.push(preloadScript);
-}
-
 // Common renderer initialization
 require('@electron/internal/renderer/common-init');

@@ -127,8 +122,9 @@ if (nodeIntegration) {
  }
 }

+const { preloadPaths } = ipcRendererUtils.invokeSync(IPC_MESSAGES.BROWSER_NONSANDBOX_LOAD);
 // Load the preload scripts.
-for (const preloadScript of preloadScripts) {
+for (const preloadScript of preloadPaths) {
  try {
    Module._load(preloadScript);
  } catch (error) {
--- a/lib/renderer/web-view/guest-view-internal.ts
+++ b/lib/renderer/web-view/guest-view-internal.ts
@@ -6,7 +6,6 @@ const { mainFrame: webFrame } = process._linkedBinding('electron_renderer_web_fr

 export interface GuestViewDelegate {
  dispatchEvent (eventName: string, props: Record<string, any>): void;
-  reset(): void;
 }

 const DEPRECATED_EVENTS: Record<string, string> = {
@@ -14,11 +13,6 @@ const DEPRECATED_EVENTS: Record<string, string> = {
 } as const;

 export function registerEvents (viewInstanceId: number, delegate: GuestViewDelegate) {
-  ipcRendererInternal.on(`${IPC_MESSAGES.GUEST_VIEW_INTERNAL_DESTROY_GUEST}-${viewInstanceId}`, function () {
-    delegate.reset();
-    delegate.dispatchEvent('destroyed', {});
-  });
-
  ipcRendererInternal.on(`${IPC_MESSAGES.GUEST_VIEW_INTERNAL_DISPATCH_EVENT}-${viewInstanceId}`, function (event, eventName, props) {
    if (DEPRECATED_EVENTS[eventName] != null) {
      delegate.dispatchEvent(DEPRECATED_EVENTS[eventName], props);
@@ -29,7 +23,6 @@ export function registerEvents (viewInstanceId: number, delegate: GuestViewDeleg
 }

 export function deregisterEvents (viewInstanceId: number) {
-  ipcRendererInternal.removeAllListeners(`${IPC_MESSAGES.GUEST_VIEW_INTERNAL_DESTROY_GUEST}-${viewInstanceId}`);
  ipcRendererInternal.removeAllListeners(`${IPC_MESSAGES.GUEST_VIEW_INTERNAL_DISPATCH_EVENT}-${viewInstanceId}`);
 }

--- a/lib/renderer/web-view/web-view-element.ts
+++ b/lib/renderer/web-view/web-view-element.ts
@@ -55,8 +55,7 @@ const defineWebViewElement = (hooks: WebViewImplHooks) => {
      }
      if (!internal.elementAttached) {
        hooks.guestViewInternal.registerEvents(internal.viewInstanceId, {
-          dispatchEvent: internal.dispatchEvent.bind(internal),
-          reset: internal.reset.bind(internal)
+          dispatchEvent: internal.dispatchEvent.bind(internal)
        });
        internal.elementAttached = true;
        (internal.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC) as SrcAttribute).parse();
--- a/lib/renderer/web-view/web-view-impl.ts
+++ b/lib/renderer/web-view/web-view-impl.ts
@@ -191,7 +191,7 @@ export class WebViewImpl {

  attachGuestInstance (guestInstanceId: number) {
    if (guestInstanceId === -1) {
-      // Do nothing
+      this.dispatchEvent('destroyed');
      return;
    }

--- a/npm/install.js
+++ b/npm/install.js
@@ -70,17 +70,8 @@ function isInstalled () {

 // unzips and makes path.txt point at the correct executable
 function extractFile (zipPath) {
-  return new Promise((resolve, reject) => {
-    extract(zipPath, { dir: path.join(__dirname, 'dist') }, err => {
-      if (err) return reject(err);
-
-      fs.writeFile(path.join(__dirname, 'path.txt'), platformPath, err => {
-        if (err) return reject(err);
-
-        resolve();
-      });
-    });
-  });
+  return extract(zipPath, { dir: path.join(__dirname, 'dist') })
+    .then(() => fs.promises.writeFile(path.join(__dirname, 'path.txt'), platformPath));
 }

 function getPlatformPath () {
--- a/npm/package.json
+++ b/npm/package.json
@@ -10,9 +10,9 @@
  "dependencies": {
    "@electron/get": "^1.14.1",
    "@types/node": "^16.11.26",
-    "extract-zip": "^1.0.3"
+    "extract-zip": "^2.0.1"
  },
  "engines": {
-    "node": ">= 8.6"
+    "node": ">= 10.17.0"
  }
 }
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "electron",
-  "version": "19.0.14",
+  "version": "20.0.1",
  "repository": "https://github.com/electron/electron",
  "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
  "devDependencies": {
@@ -142,5 +142,8 @@
    "DEPS": [
      "node script/gen-hunspell-filenames.js"
    ]
+  },
+  "resolutions": {
+    "nan": "nodejs/nan#16fa32231e2ccd89d2804b3f765319128b20c4ac"
  }
 }
--- a/patches/boringssl/expose_aes-cfb.patch
+++ b/patches/boringssl/expose_aes-cfb.patch
@@ -58,10 +58,10 @@ index 852b76bea69988e0b3ac76a17b603128f239dde0..d443f4dc2daea0b7aa86ae75d31d995f
   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 2458847e5640fe955a9971aa77c27251e5091db5..a0b3ac5f6b55921a542f27108beca93d6372c6fc 100644
+index 380d25d9c2a8efb0636db5749a8e3b1ba6908ad5..7a5aa1c142e15cf06e63882e83d82a93c0d38785 100644
 --- a/include/openssl/cipher.h
 +++ b/include/openssl/cipher.h
-@@ -448,6 +448,7 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_des_ede3_ecb(void);
+@@ -460,6 +460,7 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_des_ede3_ecb(void);
 
 // EVP_aes_128_cfb128 is only available in decrepit.
 OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_128_cfb128(void);
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -21,15 +21,11 @@ resource_file_conflict.patch
 scroll_bounce_flag.patch
 mas_blink_no_private_api.patch
 mas_no_private_api.patch
-mas-cfisobjc.patch
 mas-cgdisplayusesforcetogray.patch
-mas-audiodeviceduck.patch
 mas_disable_remote_layer.patch
 mas_disable_remote_accessibility.patch
 mas_disable_custom_window_frame.patch
-mas_avoid_usage_of_abort_report_np.patch
-mas_avoid_usage_of_pthread_fchdir_np.patch
-mas_avoid_usage_of_setapplicationisdaemon_and.patch
+mas_avoid_usage_of_private_macos_apis.patch
 mas_use_public_apis_to_determine_if_a_font_is_a_system_font.patch
 chrome_key_systems.patch
 add_didinstallconditionalfeatures.patch
@@ -58,7 +54,6 @@ feat_add_set_theme_source_to_allow_apps_to.patch
 add_webmessageportconverter_entangleandinjectmessageportchannel.patch
 ignore_rc_check.patch
 remove_usage_of_incognito_apis_in_the_spellchecker.patch
-chore_use_electron_resources_not_chrome_for_spellchecker.patch
 allow_disabling_blink_scheduler_throttling_per_renderview.patch
 hack_plugin_response_interceptor_to_point_to_electron.patch
 feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
@@ -80,8 +75,6 @@ skip_atk_toolchain_check.patch
 worker_feat_add_hook_to_notify_script_ready.patch
 chore_provide_iswebcontentscreationoverridden_with_full_params.patch
 fix_properly_honor_printing_page_ranges.patch
-fix_use_electron_generated_resources.patch
-chore_expose_v8_initialization_isolate_callbacks.patch
 export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
 fix_export_zlib_symbols.patch
 don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
@@ -103,7 +96,6 @@ process_singleton.patch
 fix_expose_decrementcapturercount_in_web_contents_impl.patch
 add_ui_scopedcliboardwriter_writeunsaferawdata.patch
 feat_add_data_parameter_to_processsingleton.patch
-mas_gate_private_enterprise_APIs.patch
 load_v8_snapshot_in_browser_process.patch
 fix_adapt_exclusive_access_for_electron_needs.patch
 fix_aspect_ratio_with_max_size.patch
@@ -116,21 +108,10 @@ build_make_libcxx_abi_unstable_false_for_electron.patch
 introduce_ozoneplatform_electron_can_call_x11_property.patch
 make_gtk_getlibgtk_public.patch
 build_disable_print_content_analysis.patch
-feat_move_firstpartysets_to_content_browser_client.patch
 custom_protocols_plzserviceworker.patch
+feat_filter_out_non-shareable_windows_in_the_current_application_in.patch
 posix_replace_doubleforkandexec_with_forkandspawn.patch
-cherry-pick-22c61cfae5d1.patch
-remove_default_window_title.patch
-keep_handling_scroll_update_if_you_can.patch
+fix_allow_guest_webcontents_to_enter_fullscreen.patch
+disable_freezing_flags_after_init_in_node.patch
 chore_add_electron_deps_to_gitignores.patch
 chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
-disable_gpu_acceleration_on_vmware_on_linux.patch
-add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
-cherry-pick-94a8bdafc8c6.patch
-fix_mac_build_with_enable_plugins_false.patch
-fix_windows_build_with_enable_plugins_false.patch
-cherry-pick-54e32332750c.patch
-cherry-pick-60d8559e150a.patch
-cherry-pick-54a7927b19f9.patch
-cherry-pick-bd9724c9fe63.patch
-cherry-pick-c643d18a078d.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-= and Ctrl-Plus show up as such

 diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
-index 2468b2c5881821d6f8e24a0e7c42243427b384ad..7e44c97edabf5ae012ff4f84d1404d8f223a13fe 100644
+index 9fca6ff3e62204095ff0edc6fafce3a61cd2ff5c..089f8b818018a600cc8c90811f09374a1f702d8b 100644
 --- a/ui/base/accelerators/accelerator.cc
 +++ b/ui/base/accelerators/accelerator.cc
@@ -11,6 +11,7 @@
@@ -44,7 +44,7 @@ index 2468b2c5881821d6f8e24a0e7c42243427b384ad..7e44c97edabf5ae012ff4f84d1404d8f
   }
 
 #if BUILDFLAG(IS_MAC)
-@@ -451,7 +461,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
+@@ -447,7 +457,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
     const std::u16string& shortcut) const {
   std::u16string result = shortcut;
 
@@ -53,7 +53,7 @@ index 2468b2c5881821d6f8e24a0e7c42243427b384ad..7e44c97edabf5ae012ff4f84d1404d8f
     result = ApplyModifierToAcceleratorString(result, IDS_APP_SHIFT_KEY);
 
   // Note that we use 'else-if' in order to avoid using Ctrl+Alt as a shortcut.
-@@ -459,7 +469,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
+@@ -455,7 +465,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
   // more information.
   if (IsCtrlDown())
     result = ApplyModifierToAcceleratorString(result, 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 660c5f35c6095b23cc483c8eb1c119c215dc681d..961c0d7f7a9fe5f9e130998aeb0c872c571b710e 100644
+index 3cd3d27448485e30dda92782df2df1e11635b26b..39c1615e0ac1456d2d2b350e03ef6e56c8efee53 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
-@@ -240,6 +240,10 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -239,6 +239,10 @@ int GpuMain(MainFunctionParams parameters) {
   // to the GpuProcessHost once the GpuServiceImpl has started.
   viz::GpuServiceImpl::InstallPreInitializeLogHandler();
 
@@ -24,9 +24,9 @@ index 660c5f35c6095b23cc483c8eb1c119c215dc681d..961c0d7f7a9fe5f9e130998aeb0c872c
   // 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
-@@ -346,7 +350,6 @@ int GpuMain(MainFunctionParams parameters) {
-   GpuProcess gpu_process(io_thread_priority);
- #endif
+@@ -345,7 +349,6 @@ int GpuMain(MainFunctionParams parameters) {
+   ChildProcess gpu_process(io_thread_priority);
+   DCHECK(base::ThreadPoolInstance::Get()->WasStarted());
 
 -  auto* client = GetContentClient()->gpu();
   if (client)
--- 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 eb6f4c87c4479d5f4fb8e3f85a231fb9cc744a63..11298b413021b4d438195482db253a93356b2862 100644
+index accbd08ec3f126e5fd5d5f3c7f636d8ccea56457..59e6c571ceb6699ddcb5cb178383ed382b277dea 100644
 --- a/content/public/renderer/render_frame_observer.h
 +++ b/content/public/renderer/render_frame_observer.h
-@@ -132,6 +132,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
+@@ -136,6 +136,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 eb6f4c87c4479d5f4fb8e3f85a231fb9cc744a63..11298b413021b4d438195482db253a93
                                         int32_t world_id) {}
   virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index f217de19126feeeafee01b2be31ced936696ce20..95966ce7f0eeb0a7f2822bef69b540ac6bfe298d 100644
+index 2c84b31ec771c11818e677e5d120fb965db6da86..f703ab8f616e9765ed3384654a271f251c16ac71 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4489,6 +4489,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4469,6 +4469,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
     observer.DidCreateScriptContext(context, world_id);
 }
 
@@ -40,10 +40,10 @@ index f217de19126feeeafee01b2be31ced936696ce20..95966ce7f0eeb0a7f2822bef69b540ac
                                                int world_id) {
   for (auto& observer : observers_)
 diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
-index d8ffccc148622d4eb0388e03c78ff1def4290701..5a3162cc88e5a48b04fbbb74a5c2ba4b7dd8a5d3 100644
+index 3d492ed695a78519207c3e760405b2b7f4edb80e..d6ea308e4eaba67a597af2c08c406942588811a1 100644
 --- a/content/renderer/render_frame_impl.h
 +++ b/content/renderer/render_frame_impl.h
-@@ -599,6 +599,8 @@ class CONTENT_EXPORT RenderFrameImpl
+@@ -608,6 +608,8 @@ class CONTENT_EXPORT RenderFrameImpl
                           uint32_t ng_call_count) override;
   void DidCreateScriptContext(v8::Local<v8::Context> context,
                               int world_id) override;
@@ -53,10 +53,10 @@ index d8ffccc148622d4eb0388e03c78ff1def4290701..5a3162cc88e5a48b04fbbb74a5c2ba4b
                                 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 5adee94f81c0e98db976ac1c6c55fb5eab8c2e65..9d3e43f4394ad9a4377b47a001c4baf4027cbe7c 100644
+index 97c7d874e74ed65e960b1cce18edc1520583a2ab..c6317472b0ce1375e1c5762be59684a74c7bcde5 100644
 --- a/third_party/blink/public/web/web_local_frame_client.h
 +++ b/third_party/blink/public/web/web_local_frame_client.h
-@@ -584,6 +584,9 @@ class BLINK_EXPORT WebLocalFrameClient {
+@@ -602,6 +602,9 @@ class BLINK_EXPORT WebLocalFrameClient {
   virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                       int32_t world_id) {}
 
@@ -79,10 +79,10 @@ index a6ba8411384855c82712960375bc949c5c2bd522..fc86ca807c9c1bda9236160580b09415
   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 f36d04ff77481bd30e0de3f6d45c54dfece4067c..d30f569cd68716b9e963cf0fb5da3f7e65cc215a 100644
+index c5b2d86bb3f7d75e99fda9c116dfd8f6ba036f1b..9d3e10d067006fa2043929dc3f9ab39f9bc126c9 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client.h
-@@ -303,6 +303,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
+@@ -298,6 +298,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
 
   virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                       int32_t world_id) = 0;
@@ -92,10 +92,10 @@ index f36d04ff77481bd30e0de3f6d45c54dfece4067c..d30f569cd68716b9e963cf0fb5da3f7e
                                         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 5a83dcdf50acc27da2b1fbb3e515cb4316305a3a..86f31acc40a2dd296c34f3ecf5ef6ccd97cbc18c 100644
+index da7bd0f6c3aa7f4b787c404e1d169ee261e17836..ad2e7a0905dd7678a1f29aa03c9571bc84678029 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
-@@ -275,6 +275,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
+@@ -273,6 +273,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
     web_frame_->Client()->DidCreateScriptContext(context, world_id);
 }
 
@@ -110,7 +110,7 @@ index 5a83dcdf50acc27da2b1fbb3e515cb4316305a3a..86f31acc40a2dd296c34f3ecf5ef6ccd
     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 ac81fdc1ac99ca02458a10c0d258b846a8a9955e..ed838db2474790437ff4b57e23a1e289afce4d47 100644
+index f2e228ab14d71999c64c204d5f65df326fadbd17..d983d944a5d28de8711c50efe73e4b104b403f9b 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
@@ -80,6 +80,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
@@ -123,10 +123,10 @@ index ac81fdc1ac99ca02458a10c0d258b846a8a9955e..ed838db2474790437ff4b57e23a1e289
                                 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 aab6a77b18f83adeac065083f83b94b7ff251282..0d0e272a162be8d1bee9e0122e3e7a59b0ad32a3 100644
+index a9bd5283d3c65728dd3293abe88ffd02d3eee4fc..f5e4a927f2f5114e62d76fec86d6a5d2d2321166 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
-@@ -359,6 +359,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
+@@ -352,6 +352,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
 
   void DidCreateScriptContext(v8::Local<v8::Context>,
                               int32_t world_id) override {}
--- a/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
+++ b/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
@@ -1,176 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: msizanoen1 <msizanoen@qtmlabs.xyz>
-Date: Tue, 19 Jul 2022 05:11:06 +0200
-Subject: Add maximized parameter to LinuxUI::GetWindowFrameProvider
-
-This allows ClientFrameViewLinux to instruct the toolkit to draw the window
-decorations in maximized mode where needed, preventing empty space caused
-by decoration shadows and rounded titlebars around the window while maximized.
-
-diff --git a/ui/gtk/gtk_ui.cc b/ui/gtk/gtk_ui.cc
-index c037fa8db6d4a5ebeb7257627db206e9bab57ecc..14eddfd043e748400a9ee81ce5346a53f10ea03c 100644
--- a/ui/gtk/gtk_ui.cc
-+++ b/ui/gtk/gtk_ui.cc
-@@ -757,13 +757,15 @@ std::unique_ptr<views::NavButtonProvider> GtkUi::CreateNavButtonProvider() {
-   return nullptr;
- }
- 
-views::WindowFrameProvider* GtkUi::GetWindowFrameProvider(bool solid_frame) {
-+views::WindowFrameProvider* GtkUi::GetWindowFrameProvider(bool solid_frame, bool maximized) {
-   if (!GtkCheckVersion(3, 14))
-     return nullptr;
-   auto& provider =
-      solid_frame ? solid_frame_provider_ : transparent_frame_provider_;
-+      maximized
-+        ? (solid_frame ? solid_maximized_frame_provider_ : transparent_maximized_frame_provider_)
-+        : (solid_frame ? solid_frame_provider_ : transparent_frame_provider_);
-   if (!provider)
-    provider = std::make_unique<gtk::WindowFrameProviderGtk>(solid_frame);
-+    provider = std::make_unique<gtk::WindowFrameProviderGtk>(solid_frame, maximized);
-   return provider.get();
- }
- 
-diff --git a/ui/gtk/gtk_ui.h b/ui/gtk/gtk_ui.h
-index 8e609b8311c6b69ef7b6753117542d9e60b2c8ab..a329822c3285599954d77dd5a8e33ccc10e5f626 100644
--- a/ui/gtk/gtk_ui.h
-+++ b/ui/gtk/gtk_ui.h
-@@ -107,7 +107,7 @@ class GtkUi : public views::LinuxUI {
-   bool PreferDarkTheme() const override;
-   bool AnimationsEnabled() const override;
-   std::unique_ptr<views::NavButtonProvider> CreateNavButtonProvider() override;
-  views::WindowFrameProvider* GetWindowFrameProvider(bool solid_frame) override;
-+  views::WindowFrameProvider* GetWindowFrameProvider(bool solid_frame, bool maximized) override;
-   base::flat_map<std::string, std::string> GetKeyboardLayoutMap() override;
-   std::string GetCursorThemeName() override;
-   int GetCursorThemeSize() override;
-@@ -218,6 +218,8 @@ class GtkUi : public views::LinuxUI {
-   // while Chrome is running.
-   std::unique_ptr<views::WindowFrameProvider> solid_frame_provider_;
-   std::unique_ptr<views::WindowFrameProvider> transparent_frame_provider_;
-+  std::unique_ptr<views::WindowFrameProvider> solid_maximized_frame_provider_;
-+  std::unique_ptr<views::WindowFrameProvider> transparent_maximized_frame_provider_;
- };
- 
- }  // namespace gtk
-diff --git a/ui/gtk/window_frame_provider_gtk.cc b/ui/gtk/window_frame_provider_gtk.cc
-index e4dbdad327eb77994ffd7f068c67336a19897915..d3ae0636455489a7c7443df85cb769952c98aca2 100644
--- a/ui/gtk/window_frame_provider_gtk.cc
-+++ b/ui/gtk/window_frame_provider_gtk.cc
-@@ -38,16 +38,18 @@ std::string GetThemeName() {
-   return theme_string;
- }
- 
-GtkCssContext WindowContext(bool solid_frame, bool focused) {
-+GtkCssContext WindowContext(bool solid_frame, bool maximized, bool focused) {
-   std::string selector = "#window.background.";
-   selector += solid_frame ? "solid-csd" : "csd";
-+  if (maximized)
-+    selector += ".maximized";
-   if (!focused)
-     selector += ":inactive";
-   return AppendCssNodeToStyleContext({}, selector);
- }
- 
-GtkCssContext DecorationContext(bool solid_frame, bool focused) {
-  auto context = WindowContext(solid_frame, focused);
-+GtkCssContext DecorationContext(bool solid_frame, bool maximized, bool focused) {
-+  auto context = WindowContext(solid_frame, maximized, focused);
-   // GTK4 renders the decoration directly on the window.
-   if (!GtkCheckVersion(4))
-     context = AppendCssNodeToStyleContext(context, "#decoration");
-@@ -64,8 +66,8 @@ GtkCssContext DecorationContext(bool solid_frame, bool focused) {
-   return context;
- }
- 
-GtkCssContext HeaderContext(bool solid_frame, bool focused) {
-  auto context = WindowContext(solid_frame, focused);
-+GtkCssContext HeaderContext(bool solid_frame, bool maximized, bool focused) {
-+  auto context = WindowContext(solid_frame, maximized, focused);
-   context =
-       AppendCssNodeToStyleContext(context, "#headerbar.header-bar.titlebar");
-   if (!focused)
-@@ -110,8 +112,8 @@ int ComputeTopCornerRadius() {
-   // need to experimentally determine the corner radius by rendering a sample.
-   // Additionally, in GTK4, the headerbar corners get clipped by the window
-   // rather than the headerbar having its own rounded corners.
-  auto context = GtkCheckVersion(4) ? DecorationContext(false, false)
-                                    : HeaderContext(false, false);
-+  auto context = GtkCheckVersion(4) ? DecorationContext(false, false, false)
-+                                    : HeaderContext(false, false, false);
-   ApplyCssToContext(context, R"(window, headerbar {
-     background-image: none;
-     background-color: black;
-@@ -169,8 +171,8 @@ void WindowFrameProviderGtk::Asset::CloneFrom(
-   unfocused_bitmap = src.unfocused_bitmap;
- }
- 
-WindowFrameProviderGtk::WindowFrameProviderGtk(bool solid_frame)
-    : solid_frame_(solid_frame) {}
-+WindowFrameProviderGtk::WindowFrameProviderGtk(bool solid_frame, bool maximized)
-+    : solid_frame_(solid_frame), maximized_(maximized) {}
- 
- WindowFrameProviderGtk::~WindowFrameProviderGtk() = default;
- 
-@@ -264,7 +266,7 @@ void WindowFrameProviderGtk::PaintWindowFrame(gfx::Canvas* canvas,
-       top_area_height_dip * scale - asset.frame_thickness_px.top();
- 
-   auto header = PaintHeaderbar({client_bounds_px.width(), top_area_height_px},
-                               HeaderContext(solid_frame_, focused), scale);
-+                               HeaderContext(solid_frame_, maximized_, focused), scale);
-   image = gfx::ImageSkia::CreateFrom1xBitmap(header);
-   // In GTK4, the headerbar gets clipped by the window.
-   if (GtkCheckVersion(4)) {
-@@ -296,7 +298,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) {
- 
-   gfx::Rect frame_bounds_dip(kMaxFrameSizeDip, kMaxFrameSizeDip,
-                              2 * kMaxFrameSizeDip, 2 * kMaxFrameSizeDip);
-  auto focused_context = DecorationContext(solid_frame_, true);
-+  auto focused_context = DecorationContext(solid_frame_, maximized_, true);
-   frame_bounds_dip.Inset(-GtkStyleContextGetPadding(focused_context));
-   frame_bounds_dip.Inset(-GtkStyleContextGetBorder(focused_context));
-   gfx::Size bitmap_size(BitmapSizePx(asset), BitmapSizePx(asset));
-@@ -304,7 +306,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) {
-       PaintBitmap(bitmap_size, frame_bounds_dip, focused_context, scale);
-   asset.unfocused_bitmap =
-       PaintBitmap(bitmap_size, frame_bounds_dip,
-                  DecorationContext(solid_frame_, false), scale);
-+                  DecorationContext(solid_frame_, maximized_, false), scale);
- 
-   // In GTK4, there's no way to obtain the frame thickness from CSS values
-   // directly, so we must determine it experimentally based on the drawn
-diff --git a/ui/gtk/window_frame_provider_gtk.h b/ui/gtk/window_frame_provider_gtk.h
-index d3039d73161378197557947aece88d2710c1e486..f7d4605938210b0b75517bb7bcab28b588a16520 100644
--- a/ui/gtk/window_frame_provider_gtk.h
-+++ b/ui/gtk/window_frame_provider_gtk.h
-@@ -14,7 +14,7 @@ namespace gtk {
- 
- class WindowFrameProviderGtk : public views::WindowFrameProvider {
-  public:
-  explicit WindowFrameProviderGtk(bool solid_frame);
-+  explicit WindowFrameProviderGtk(bool solid_frame, bool maximized);
- 
-   WindowFrameProviderGtk(const WindowFrameProviderGtk&) = delete;
-   WindowFrameProviderGtk& operator=(const WindowFrameProviderGtk&) = delete;
-@@ -69,6 +69,9 @@ class WindowFrameProviderGtk : public views::WindowFrameProvider {
- 
-   // Cached bitmaps and metrics.  The scale is rounded to percent.
-   base::flat_map<int, Asset> assets_;
-+
-+  // Whether to draw the window decorations as maximized.
-+  bool maximized_;
- };
- 
- }  // namespace gtk
-diff --git a/ui/views/linux_ui/linux_ui.h b/ui/views/linux_ui/linux_ui.h
-index 5f312e01508c49033bf2d05b9dc083e524f37e5f..7590acd760ba4f36e5a77c1972afc5fc08e616ff 100644
--- a/ui/views/linux_ui/linux_ui.h
-+++ b/ui/views/linux_ui/linux_ui.h
-@@ -189,7 +189,7 @@ class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory,
-   // if transparency is unsupported and the frame should be rendered opaque.
-   // The returned object is not owned by the caller and will remain alive until
-   // the process ends.
-  virtual WindowFrameProvider* GetWindowFrameProvider(bool solid_frame) = 0;
-+  virtual WindowFrameProvider* GetWindowFrameProvider(bool solid_frame, bool maximized) = 0;
- 
-   // Returns a map of KeyboardEvent code to KeyboardEvent key values.
-   virtual base::flat_map<std::string, std::string> GetKeyboardLayoutMap() = 0;
--- a/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch
+++ b/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch
@@ -8,7 +8,7 @@ was removed as part of the Raw Clipboard API scrubbing.
 https://bugs.chromium.org/p/chromium/issues/detail?id=1217643

 diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
-index 3009acd40eee36bc3d4dd8642f0ce5e6476da973..1d52ce84184a3ca94e4e0f04d331bf56d75e07d0 100644
+index 1eb1d0fe4696f26e7de43fc8797c283e9e6db042..766f8d8df866ce7fbc337cecceb715cced39643c 100644
 --- a/ui/base/clipboard/scoped_clipboard_writer.cc
 +++ b/ui/base/clipboard/scoped_clipboard_writer.cc
@@ -227,6 +227,16 @@ void ScopedClipboardWriter::WriteEncodedDataTransferEndpointForTesting(
--- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
@@ -6,7 +6,7 @@ Subject: 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 a9267b633e126f057e914b895f280ed658ff279d..179b5449f53c2d7b9024fb08fe1b1f6c03c6d5b0 100644
+index 1f6d9be10432416f591a616805494b5d78975df1..e73f70c62ac2e69c918bdf39bd53f74a47066f4e 100644
 --- a/content/browser/renderer_host/render_view_host_impl.cc
 +++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -665,6 +665,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
@@ -22,11 +22,11 @@ index a9267b633e126f057e914b895f280ed658ff279d..179b5449f53c2d7b9024fb08fe1b1f6c
   return is_active();
 }
 diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
-index 3f0df3df3dd74ced71869ce01abf7b159387b8f4..85b169530a21bcfc016d1439a71d35378077774d 100644
+index 3ccc771a82992ae70c770fa6d2dde92904aa17db..505091e9006f7d41fa8d02e603afef1d10b35bf4 100644
 --- a/content/browser/renderer_host/render_view_host_impl.h
 +++ b/content/browser/renderer_host/render_view_host_impl.h
-@@ -137,6 +137,7 @@ class CONTENT_EXPORT RenderViewHostImpl
-   bool IsRenderViewLiveForTesting() const override;
+@@ -138,6 +138,7 @@ class CONTENT_EXPORT RenderViewHostImpl
+   void EnablePreferredSizeMode() override;
   void WriteIntoTrace(perfetto::TracedProto<TraceProto> context) const override;
 
 +  void SetSchedulerThrottling(bool allowed) override;
@@ -34,10 +34,10 @@ index 3f0df3df3dd74ced71869ce01abf7b159387b8f4..85b169530a21bcfc016d1439a71d3537
   void SendRendererPreferencesToRenderer(
       const blink::RendererPreferences& preferences);
 diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h
-index 3b01b3419c4361d5d75ad1c37e5baa3a1967bd09..35c82d931242a1180091267c18e0255840acc5ce 100644
+index 4d2a4c6746e1dbfc619faf2e16eaa4948d74e372..6c9f190ff595234eca18ff20ca0655da4689b7a2 100644
 --- a/content/public/browser/render_view_host.h
 +++ b/content/public/browser/render_view_host.h
-@@ -80,6 +80,9 @@ class CONTENT_EXPORT RenderViewHost {
+@@ -77,6 +77,9 @@ class CONTENT_EXPORT RenderViewHost {
   virtual void WriteIntoTrace(
       perfetto::TracedProto<TraceProto> context) const = 0;
 
@@ -48,7 +48,7 @@ index 3b01b3419c4361d5d75ad1c37e5baa3a1967bd09..35c82d931242a1180091267c18e02558
   // 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 fd145f0aa562d6b63fb1d3a8a9241ae1aa1ce7a0..54d30fb9db8b48b94abdb815c487f618f9bb6525 100644
+index 99978b33c294ebe37192baccb29f0a34a25aed17..ef6e9ae24979538b8746aca898d1f302827491d8 100644
 --- a/content/renderer/render_view_impl.h
 +++ b/content/renderer/render_view_impl.h
@@ -151,6 +151,8 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
@@ -85,10 +85,10 @@ index 5e4032ccf916f969cd669af7d983becddb57c72b..a858c9f2fa609ae756a2e70d0362f2de
   // 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 6504c73f614bebad7b899c8b76c4b3034b7dab7a..f76a0ee0778d7b4e4df69a4c43b4a6bfdc89294d 100644
+index 3f6460ceee1e3268db45fec668a5e75353643bcb..818394c235c3f71289218098c7db77e00d156d92 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -3689,6 +3689,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3727,6 +3727,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
   return GetPage()->GetPageScheduler();
 }
 
@@ -102,7 +102,7 @@ index 6504c73f614bebad7b899c8b76c4b3034b7dab7a..f76a0ee0778d7b4e4df69a4c43b4a6bf
 void WebViewImpl::SetVisibilityState(
     mojom::blink::PageVisibilityState visibility_state,
     bool is_initial_state) {
-@@ -3700,7 +3707,8 @@ void WebViewImpl::SetVisibilityState(
+@@ -3738,7 +3745,8 @@ void WebViewImpl::SetVisibilityState(
   }
   GetPage()->SetVisibilityState(visibility_state, is_initial_state);
   GetPage()->GetPageScheduler()->SetPageVisible(
@@ -113,10 +113,10 @@ index 6504c73f614bebad7b899c8b76c4b3034b7dab7a..f76a0ee0778d7b4e4df69a4c43b4a6bf
 
 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 5c9609a6a8d1e18981ac14ad5321fa82c3eb38e0..0a2564a8e45210ba58438e95caa70d01fac22aee 100644
+index 2f8e971ab224b36c6e464eb7524dd3d4c6b76f8c..4a9664d0ce5de431d9638e4145a21091cea78fd1 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
-@@ -420,6 +420,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -418,6 +418,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
   LocalDOMWindow* PagePopupWindow() const;
 
   PageScheduler* Scheduler() const override;
@@ -124,7 +124,7 @@ index 5c9609a6a8d1e18981ac14ad5321fa82c3eb38e0..0a2564a8e45210ba58438e95caa70d01
   void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
                           bool is_initial_state) override;
   mojom::blink::PageVisibilityState GetVisibilityState() override;
-@@ -855,6 +856,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -865,6 +866,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
   // If true, we send IPC messages when |preferred_size_| changes.
   bool send_preferred_size_changes_ = false;
 
--- 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
@@ -8,10 +8,10 @@ WebPreferences of in-process child windows, rather than relying on
 process-level command line switches, as before.

 diff --git a/third_party/blink/common/web_preferences/web_preferences.cc b/third_party/blink/common/web_preferences/web_preferences.cc
-index 4e51622d725ad0ee448ea1794c209aae7f78e09a..df6e9ed6fda9e6fa695fa3ab717847735dc63b17 100644
+index 6d51f6a77c21b60ab756dbf8d4961b351a2e2b07..26b820b3ce387e01900cec4227ff290113a833c3 100644
 --- a/third_party/blink/common/web_preferences/web_preferences.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences.cc
-@@ -140,6 +140,20 @@ WebPreferences::WebPreferences()
+@@ -142,6 +142,19 @@ WebPreferences::WebPreferences()
       fake_no_alloc_direct_call_for_testing_enabled(false),
       v8_cache_options(blink::mojom::V8CacheOptions::kDefault),
       record_whole_document(false),
@@ -20,7 +20,6 @@ index 4e51622d725ad0ee448ea1794c209aae7f78e09a..df6e9ed6fda9e6fa695fa3ab71784773
 +      is_webview(false),
 +      hidden_page(false),
 +      offscreen(false),
-+      preload(base::FilePath::StringType()),
 +      node_integration(false),
 +      node_integration_in_worker(false),
 +      node_integration_in_sub_frames(false),
@@ -33,21 +32,10 @@ index 4e51622d725ad0ee448ea1794c209aae7f78e09a..df6e9ed6fda9e6fa695fa3ab71784773
       accelerated_video_decode_enabled(false),
       animation_policy(
 diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-index 16e7501cf2da98d0046d65102e634af31c1f6c39..53fbfdb4837fe444c3564523068faadcc12afd1a 100644
+index 187fd8d9818693262256d5cbddd5e02659ba903d..28e5178361e03d1ac851fa74214931b2332dd9c2 100644
 --- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-@@ -22,6 +22,10 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
-       !data.ReadSansSerifFontFamilyMap(&out->sans_serif_font_family_map) ||
-       !data.ReadCursiveFontFamilyMap(&out->cursive_font_family_map) ||
-       !data.ReadFantasyFontFamilyMap(&out->fantasy_font_family_map) ||
-+      // Begin Electron-specific WebPreferences.
-+      !data.ReadPreloads(&out->preloads) ||
-+      !data.ReadPreload(&out->preload) ||
-+      // End Electron-specific WebPreferences.
-       !data.ReadLazyFrameLoadingDistanceThresholdsPx(
-           &out->lazy_frame_loading_distance_thresholds_px) ||
-       !data.ReadLazyImageLoadingDistanceThresholdsPx(
-@@ -145,6 +149,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -148,6 +148,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
       data.fake_no_alloc_direct_call_for_testing_enabled();
   out->v8_cache_options = data.v8_cache_options();
   out->record_whole_document = data.record_whole_document();
@@ -68,7 +56,7 @@ index 16e7501cf2da98d0046d65102e634af31c1f6c39..53fbfdb4837fe444c3564523068faadc
   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 b2b3be2019209d3810bb0dc570e2a1ebcf702ad8..0ff23de6bd73d6d0ba82402ec39d2f0812c41aab 100644
+index 59947bfd3c042e5f7d3993967fece9b519f93472..cb2a53f6147767394585ed371744d8a140aace71 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences.h
@@ -10,6 +10,7 @@
@@ -79,17 +67,15 @@ index b2b3be2019209d3810bb0dc570e2a1ebcf702ad8..0ff23de6bd73d6d0ba82402ec39d2f08
 #include "net/nqe/effective_connection_type.h"
 #include "third_party/blink/public/common/common_export.h"
 #include "third_party/blink/public/mojom/css/preferred_color_scheme.mojom-shared.h"
-@@ -152,6 +153,22 @@ struct BLINK_COMMON_EXPORT WebPreferences {
+@@ -154,6 +155,20 @@ struct BLINK_COMMON_EXPORT WebPreferences {
   blink::mojom::V8CacheOptions v8_cache_options;
   bool record_whole_document;
 
 +  // Begin Electron-specific WebPreferences.
-+  std::vector<base::FilePath> preloads;
 +  bool context_isolation;
 +  bool is_webview;
 +  bool hidden_page;
 +  bool offscreen;
-+  base::FilePath preload;
 +  bool node_integration;
 +  bool node_integration_in_worker;
 +  bool node_integration_in_sub_frames;
@@ -103,7 +89,7 @@ index b2b3be2019209d3810bb0dc570e2a1ebcf702ad8..0ff23de6bd73d6d0ba82402ec39d2f08
   // 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 30fd01c6e804d05091ff6147ac570901a8d998b9..4acd2df36ab6928947b5defe8691eccaf3cd7b19 100644
+index bd425a5869477de9095c6a41c683609d065b08c0..c7ba3ff52c9de01028c9e2be214e20cd91cbf309 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 @@
@@ -114,15 +100,11 @@ index 30fd01c6e804d05091ff6147ac570901a8d998b9..4acd2df36ab6928947b5defe8691ecca
 #include "mojo/public/cpp/bindings/struct_traits.h"
 #include "net/nqe/effective_connection_type.h"
 #include "third_party/blink/public/common/common_export.h"
-@@ -418,6 +419,60 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -428,6 +429,52 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
     return r.record_whole_document;
   }
 
 +  // Begin Electron-specific WebPreferences.
-+  static const std::vector<base::FilePath>& preloads(const blink::web_pref::WebPreferences& r) {
-+    return r.preloads;
-+  }
-+
 +  static bool context_isolation(const blink::web_pref::WebPreferences& r) {
 +    return r.context_isolation;
 +  }
@@ -139,10 +121,6 @@ index 30fd01c6e804d05091ff6147ac570901a8d998b9..4acd2df36ab6928947b5defe8691ecca
 +    return r.offscreen;
 +  }
 +
-+  static const base::FilePath& preload(const blink::web_pref::WebPreferences& r) {
-+    return r.preload;
-+  }
-+
 +  static bool node_integration(const blink::web_pref::WebPreferences& r) {
 +    return r.node_integration;
 +  }
@@ -176,7 +154,7 @@ index 30fd01c6e804d05091ff6147ac570901a8d998b9..4acd2df36ab6928947b5defe8691ecca
     return r.cookie_enabled;
   }
 diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
-index d10d1b4c0b16ac9e863077cf60feca35fa2da329..1a49fb1a11f75aa3c79cd3cc1796957d0b9a5549 100644
+index 738ac646e075f7a37ba2a263c7799a755e63d3fb..40ab2a4b9a1f9de5f201502adebc166a48fccd35 100644
 --- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 +++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
@@ -10,6 +10,7 @@ import "third_party/blink/public/mojom/v8_cache_options.mojom";
@@ -187,17 +165,15 @@ index d10d1b4c0b16ac9e863077cf60feca35fa2da329..1a49fb1a11f75aa3c79cd3cc1796957d
 
 enum PointerType {
   kPointerNone                              = 1,             // 1 << 0
-@@ -204,6 +205,22 @@ struct WebPreferences {
+@@ -206,6 +207,20 @@ struct WebPreferences {
   V8CacheOptions v8_cache_options;
   bool record_whole_document;
 
 +  // Begin Electron-specific WebPreferences.
-+  array<mojo_base.mojom.FilePath> preloads;
 +  bool context_isolation;
 +  bool is_webview;
 +  bool hidden_page;
 +  bool offscreen;
-+  mojo_base.mojom.FilePath preload;
 +  bool node_integration;
 +  bool node_integration_in_worker;
 +  bool node_integration_in_sub_frames;
--- a/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch
+++ b/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch
@@ -6,10 +6,10 @@ Subject: allow new privileges in unsandboxed child processes
 This allows unsandboxed renderers to launch setuid processes on Linux.

 diff --git a/content/browser/child_process_launcher_helper_linux.cc b/content/browser/child_process_launcher_helper_linux.cc
-index f60ad777ab7698a4518d3b1b61ade29e7c618a3a..c7781bdb49f8a92aa9ee1d8dd1af03fa9cf2dfe3 100644
+index 16d838b710d4f717733f4aa8f92f144922969b3b..ff2c78c7b803159dde97dafdb799d9b8761dc3fd 100644
 --- a/content/browser/child_process_launcher_helper_linux.cc
 +++ b/content/browser/child_process_launcher_helper_linux.cc
-@@ -53,6 +53,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
+@@ -54,6 +54,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
   if (GetProcessType() == switches::kRendererProcess) {
     const int sandbox_fd = SandboxHostLinux::GetInstance()->GetChildSocket();
     options->fds_to_remap.push_back(std::make_pair(sandbox_fd, GetSandboxFD()));
@@ -27,4 +27,4 @@ index f60ad777ab7698a4518d3b1b61ade29e7c618a3a..c7781bdb49f8a92aa9ee1d8dd1af03fa
 +    }
   }
 
-   options->environment = delegate_->GetEnvironment();
+   for (const auto& remapped_fd : file_data_->additional_remapped_fds) {
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -15,7 +15,7 @@ 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 a519c49a01987feab4dadbc4ba48b73e943fa404..c8d2a65cb428e85c33675668cc106f0af124dfee 100644
+index b1b53542ad5c10619c86e423c61007cd380d0ff9..903794e43f81fb5783275eff8ffb7c9ef89e03e9 100644
 --- a/third_party/blink/renderer/core/frame/frame.cc
 +++ b/third_party/blink/renderer/core/frame/frame.cc
@@ -123,14 +123,6 @@ bool Frame::Detach(FrameDetachType type) {
@@ -49,10 +49,10 @@ index a519c49a01987feab4dadbc4ba48b73e943fa404..c8d2a65cb428e85c33675668cc106f0a
   // 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 3efc0a04ae3fa60dce4aeb9a296c8dd1bb43320a..5dac7c18f39abefcc318ba2a7b8fad449189d0b6 100644
+index fccb4b6dc2da482f10f1ea011931361d9fd96d06..3e89a6f0cc2959fe305c08b482e2c014d59e15d2 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -543,10 +543,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -544,10 +544,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
   }
   DCHECK(!view_ || !view_->IsAttached());
 
@@ -63,7 +63,7 @@ index 3efc0a04ae3fa60dce4aeb9a296c8dd1bb43320a..5dac7c18f39abefcc318ba2a7b8fad44
   if (!Client())
     return false;
 
-@@ -592,6 +588,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -593,6 +589,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
   DCHECK(!view_->IsAttached());
   Client()->WillBeDetached();
 
--- a/patches/chromium/boringssl_build_gn.patch
+++ b/patches/chromium/boringssl_build_gn.patch
@@ -6,7 +6,7 @@ Subject: boringssl BUILD.gn
 Build BoringSSL with some extra functions that nodejs needs.

 diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
-index f222ae94a5a10ced84e41ef84560af46a910577f..c18d26de9a63befca3c77fe5ecd93975a016797f 100644
+index efcbdf378b61af0a4b0f2cd784160d95439e84e1..fc6bba3fdd71ee40bb38f7d95a2f4dccd82d3e17 100644
 --- a/third_party/boringssl/BUILD.gn
 +++ b/third_party/boringssl/BUILD.gn
@@ -44,6 +44,20 @@ config("no_asm_config") {
--- a/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch
+++ b/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch
@@ -10,10 +10,10 @@ breakpad independently, as a "browser" process. This patches
 crash annotation.

 diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
-index 43f6d476f3ee2759cf41c492f932522994e7ddec..8df14f416ee321e1259433715a61fa6025207d80 100644
+index b1f8fd4494e7f5deac078023c2e0240d701e1f13..a372e9bb12f9cec6235fe529d73b6e0009328038 100644
 --- a/components/crash/core/app/breakpad_linux.cc
 +++ b/components/crash/core/app/breakpad_linux.cc
-@@ -718,8 +718,13 @@ bool CrashDone(const MinidumpDescriptor& minidump,
+@@ -719,8 +719,13 @@ bool CrashDone(const MinidumpDescriptor& minidump,
   log_path[log_path_len] = '\0';
   info.log_filename = log_path;
 #endif
@@ -29,7 +29,7 @@ index 43f6d476f3ee2759cf41c492f932522994e7ddec..8df14f416ee321e1259433715a61fa60
   info.distro = base::g_linux_distro;
   info.distro_length = my_strlen(base::g_linux_distro);
   info.upload = upload;
-@@ -2025,8 +2030,13 @@ void InitCrashReporter(const std::string& process_type) {
+@@ -2027,8 +2032,13 @@ void InitCrashReporter(const std::string& process_type) {
       process_type == kWebViewSingleProcessType ||
       process_type == kBrowserProcessType ||
 #endif
@@ -40,6 +40,6 @@ index 43f6d476f3ee2759cf41c492f932522994e7ddec..8df14f416ee321e1259433715a61fa60
 +    g_is_node = true;
 +  }
 +
- #if !BUILDFLAG(IS_CHROMEOS_ASH)
+ #if !BUILDFLAG(IS_CHROMEOS)
   SetUploadURL(GetCrashReporterClient()->GetUploadUrl());
 #endif
--- a/patches/chromium/build_add_electron_tracing_category.patch
+++ b/patches/chromium/build_add_electron_tracing_category.patch
@@ -8,7 +8,7 @@ categories in use are known / declared.  This patch is required for us
 to introduce a new Electron category for Electron-specific tracing.

 diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
-index 0736e7021761e6019e1b52448d21ffdb73b964fc..571b553e9aaa98739851d0ff312eefe9f6a75596 100644
+index a1a93418b0b0d56f92647aa1087bb4485c354201..191bfe2d3922d2e65f0be10d6436c50efc3b0880 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
@@ -80,6 +80,7 @@
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -11,10 +11,10 @@ if we ever align our .pak file generation with Chrome we can remove this
 patch.

 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 3c40d999a9545051e91a9f0ad3bf7ca2a95d80c4..b5a20be5e22238e7e1969bdaf52c0b05e84bb846 100644
+index b6234183651923505bd2a4a8640ea21508033ef1..e486f92e909f43bb65633245b7dcb3145d0a7604 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -171,11 +171,16 @@ if (!is_android && !is_mac) {
+@@ -175,11 +175,16 @@ if (!is_android && !is_mac) {
         "common/crash_keys.h",
       ]
 
@@ -33,10 +33,10 @@ index 3c40d999a9545051e91a9f0ad3bf7ca2a95d80c4..b5a20be5e22238e7e1969bdaf52c0b05
         "//base",
         "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 948d05358b89895faa97a7d383bfac66a45464a8..43859d267010103daf80525a5af0f312a577411c 100644
+index bbe8847b3da8d6ec9c5d10bbe875de8c34e060d3..e2e12c141932f52f49d24a0bad4a53007133d9de 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4560,7 +4560,7 @@ static_library("browser") {
+@@ -4551,7 +4551,7 @@ static_library("browser") {
 
     # On Windows, the hashes are embedded in //chrome:chrome_initial rather
     # than here in :chrome_dll.
@@ -46,10 +46,10 @@ index 948d05358b89895faa97a7d383bfac66a45464a8..43859d267010103daf80525a5af0f312
       sources += [ "certificate_viewer_stub.cc" ]
     }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 641f52eb7952858738a6623b480f767261e5d009..6d0c624ea62a9125ef7e5579da197de2327a12ff 100644
+index cd30ea6c938860837d7427fee851974b0ec5831b..d88eb38a8ce9a0f607b85e7efe40fe23f6ab5f08 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -6002,7 +6002,6 @@ test("unit_tests") {
+@@ -5912,7 +5912,6 @@ test("unit_tests") {
 
     deps += [
       "//chrome:other_version",
@@ -57,7 +57,7 @@ index 641f52eb7952858738a6623b480f767261e5d009..6d0c624ea62a9125ef7e5579da197de2
       "//chrome//services/util_win:unit_tests",
       "//chrome/app:chrome_dll_resources",
       "//chrome/browser:chrome_process_finder",
-@@ -6025,6 +6024,10 @@ test("unit_tests") {
+@@ -5936,6 +5935,10 @@ test("unit_tests") {
       "//ui/resources",
     ]
 
@@ -68,7 +68,7 @@ index 641f52eb7952858738a6623b480f767261e5d009..6d0c624ea62a9125ef7e5579da197de2
     ldflags = [
       "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
       "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -6712,7 +6715,6 @@ test("unit_tests") {
+@@ -6826,7 +6829,6 @@ test("unit_tests") {
     }
 
     deps += [
@@ -76,15 +76,14 @@ index 641f52eb7952858738a6623b480f767261e5d009..6d0c624ea62a9125ef7e5579da197de2
       "//chrome/browser:cart_db_content_proto",
       "//chrome/browser:coupon_db_content_proto",
       "//chrome/browser/media/router:test_support",
-@@ -6760,6 +6762,11 @@ test("unit_tests") {
-     if (is_chromeos) {
-       deps += [ "//ui/chromeos" ]
+@@ -6932,6 +6934,10 @@ test("unit_tests") {
     }
+   }
+ 
+  if (!is_electron_build) {
+    deps += [ "//chrome:packed_resources_integrity_hash" ]
+  }
 +
-+    if (!is_electron_build) {
-+      deps += [ "//chrome:packed_resources_integrity_hash" ]
-+    }
-+
-     if (is_chromeos_ash) {
-       deps += [
-         "//ash/assistant/model",
+   if (is_chromeos_ash) {
+     sources -= [
+       "../browser/policy/cloud/user_policy_signin_service_unittest.cc",
--- 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 d960648941d8b959b25f87b364a594ec44760348..74a14a2373305e2e62b974b34a28ea9a62c6a911 100644
+index c737e53c2ce7237974f6c749eae60ba1de7ec2c1..26ba3ae4a77bc8f525c2ad927ff2956c028ef337 100644
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
@@ -123,6 +123,9 @@ if (current_os == "") {
@@ -27,7 +27,7 @@ index d960648941d8b959b25f87b364a594ec44760348..74a14a2373305e2e62b974b34a28ea9a
   # 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
-@@ -349,6 +352,7 @@ default_compiler_configs = [
+@@ -348,6 +351,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/build_libc_as_static_library.patch
+++ b/patches/chromium/build_libc_as_static_library.patch
@@ -7,7 +7,7 @@ Build libc++ as static library to compile and pass
 nan tests

 diff --git a/buildtools/third_party/libc++/BUILD.gn b/buildtools/third_party/libc++/BUILD.gn
-index a53cc9066a3485ff6829e3c410eb523de7d074d6..9697e2dc2d0892fc7f1007d62488c2f2f24ec92f 100644
+index b3e5378f711c54b76c73179e791646d4e5e4e96b..262c8e53ec25b2e91a73b5971d64dbe5d5e005a1 100644
 --- a/buildtools/third_party/libc++/BUILD.gn
 +++ b/buildtools/third_party/libc++/BUILD.gn
@@ -44,7 +44,11 @@ config("winver") {
--- a/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch
+++ b/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch
@@ -6,10 +6,10 @@ Subject: build: make libcxx_abi_unstable false for electron
 https://nornagon.medium.com/a-libc-odyssey-973e51649063

 diff --git a/build/config/c++/BUILD.gn b/build/config/c++/BUILD.gn
-index 046792ac275853bf109537589b911cfada44ed24..e43daeaa8f8c8e23eea99b3f8f5f48f92012bbc1 100644
+index 2e5843b9f0a5d39d8dbfea0ae5d2ebb413c0ac7d..f4c901e9980ad068a2903482f712bfa8b1310057 100644
 --- a/build/config/c++/BUILD.gn
 +++ b/build/config/c++/BUILD.gn
-@@ -8,6 +8,11 @@ assert(use_custom_libcxx, "should only be used if use_custom_libcxx is set")
+@@ -9,6 +9,11 @@ assert(use_custom_libcxx, "should only be used if use_custom_libcxx is set")
 
 libcxx_abi_unstable = true
 
--- 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 ec886101b6e5347bdd832684a5c3b2cc3179c657..0287e414f4020147ddee297f7c1447c32a118905 100644
+index 28c7136b21d058e3daa7570af558f5a415b000a7..d1b7d15a7e4dede5b030e4ae9fb2ab8aa8196446 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6943,6 +6943,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -7006,6 +7006,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 ec886101b6e5347bdd832684a5c3b2cc3179c657..0287e414f4020147ddee297f7c1447c3
           &no_javascript_access);
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 335e70179a03ee379082525bb4c7d596983bd633..faa795be3a6cbc7ae13d9a42a1bdbd01ac0406a9 100644
+index 141f6e137f2d7e2a6779cad3e8729b9cfb557480..44c1f304cf2d88dca06ee1bd53c774022766ed35 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3947,6 +3947,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3953,6 +3953,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
   }
   auto* new_contents_impl = new_contents.get();
 
@@ -39,7 +39,7 @@ index 335e70179a03ee379082525bb4c7d596983bd633..faa795be3a6cbc7ae13d9a42a1bdbd01
   new_contents_impl->GetController().SetSessionStorageNamespace(
       partition_config, session_storage_namespace);
 
-@@ -3991,12 +3999,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3997,12 +4005,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
     AddWebContentsDestructionObserver(new_contents_impl);
   }
 
@@ -53,10 +53,10 @@ index 335e70179a03ee379082525bb4c7d596983bd633..faa795be3a6cbc7ae13d9a42a1bdbd01
                              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 a7f36529608011013dab96a803ad3187c940fc81..2bbcea3efede2fda4ff2c5b270e1db0135c54290 100644
+index 9c3a03faeee19f6f0a250680db36906ee64bf55a..0450700d02c74e047fa5124aa43b9f75b869917d 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
-@@ -569,6 +569,10 @@ struct CreateNewWindowParams {
+@@ -566,6 +566,10 @@ struct CreateNewWindowParams {
 
   // Governs how downloads are handled if `target_url` results in a download.
   blink.mojom.NavigationDownloadPolicy download_policy;
@@ -68,10 +68,10 @@ index a7f36529608011013dab96a803ad3187c940fc81..2bbcea3efede2fda4ff2c5b270e1db01
 
 // 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 ffa24d4b6779226ea3b94afdf176939ea7e42e34..16fb4946cb3ea2d097e8ed05bb340cc3f0782ed6 100644
+index c1beba6701e68255c212e56d78ae8259e2ffdab9..9f77c2a5df8f25876f875c4a7148d82c3dd79db8 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -579,6 +579,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -595,6 +595,8 @@ bool ContentBrowserClient::CanCreateWindow(
     const std::string& frame_name,
     WindowOpenDisposition disposition,
     const blink::mojom::WindowFeatures& features,
@@ -81,10 +81,10 @@ index ffa24d4b6779226ea3b94afdf176939ea7e42e34..16fb4946cb3ea2d097e8ed05bb340cc3
     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 ae3dda4b9b40bb0d4c1a10eaedda9270d3543a8b..9b988bb631ab759739ae01c918efb1d563d5aafc 100644
+index a49794184baa977ddf03cd911f8d8d7d671df65f..7997c0de85315e30b350316f33e598a0221d583f 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -165,6 +165,7 @@ class NetworkService;
+@@ -164,6 +164,7 @@ class NetworkService;
 class TrustedURLLoaderHeaderClient;
 }  // namespace mojom
 struct ResourceRequest;
@@ -92,7 +92,7 @@ index ae3dda4b9b40bb0d4c1a10eaedda9270d3543a8b..9b988bb631ab759739ae01c918efb1d5
 }  // namespace network
 
 namespace sandbox {
-@@ -954,6 +955,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -967,6 +968,8 @@ class CONTENT_EXPORT ContentBrowserClient {
       const std::string& frame_name,
       WindowOpenDisposition disposition,
       const blink::mojom::WindowFeatures& features,
@@ -102,7 +102,7 @@ index ae3dda4b9b40bb0d4c1a10eaedda9270d3543a8b..9b988bb631ab759739ae01c918efb1d5
       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 9bbc7cf6d9542a3f013313e0c497839da2beb9d1..c01e06b08b1cca7a663e30476a551904ce9c6db8 100644
+index ef3889063b562a37fbd945fe30db0d776ecaee7a..99e8449e9c515dd70ed88546a71f83ae139178fe 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
@@ -26,6 +26,17 @@ namespace content {
@@ -124,7 +124,7 @@ index 9bbc7cf6d9542a3f013313e0c497839da2beb9d1..c01e06b08b1cca7a663e30476a551904
                                                  const OpenURLParams& params) {
   return nullptr;
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index 04aa4d993b331396ee20464f6e1d2da10c91c834..2556c044b6e28501a5fac9b0040e623b8f35f497 100644
+index 348dcde05d71e7d16e4c7bb1d8d9f8718070e669..5a9cc64d6e0d9d01f5dc133c7fcab34101bc32db 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
@@ -16,6 +16,7 @@
@@ -150,30 +150,30 @@ index 04aa4d993b331396ee20464f6e1d2da10c91c834..2556c044b6e28501a5fac9b0040e623b
   // 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 89b07508aef80680a847c106fea0e2fa58ff964b..6630af3583a6bac6135d46644280d6444fe981b8 100644
+index 03b637c4d3a68a2bff5a4e06f421f23f97f40911..6235fd626a377643851dbb98d4d089e5a59366db 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
-@@ -33,6 +33,7 @@
- #include "third_party/blink/public/platform/impression_conversions.h"
+@@ -32,6 +32,7 @@
+ #include "third_party/blink/public/mojom/page/page.mojom.h"
 #include "third_party/blink/public/platform/modules/video_capture/web_video_capture_impl_manager.h"
 #include "third_party/blink/public/platform/url_conversion.h"
 +#include "third_party/blink/public/platform/web_url_request_util.h"
 #include "third_party/blink/public/web/modules/mediastream/web_media_stream_device_observer.h"
 #include "third_party/blink/public/web/web_frame_widget.h"
 #include "third_party/blink/public/web/web_local_frame.h"
-@@ -295,6 +296,10 @@ WebView* RenderViewImpl::CreateView(
-     params->impression = blink::ConvertWebImpressionToImpression(*impression);
-   }
+@@ -302,6 +303,10 @@ WebView* RenderViewImpl::CreateView(
+       /*openee_can_access_opener_origin=*/true, !creator->IsAllowedToDownload(),
+       creator->IsAdSubframe());
 
 +  params->raw_features = features.raw_features.Utf8(
 +      WTF::UTF8ConversionMode::kStrictUTF8ConversionReplacingUnpairedSurrogatesWithFFFD);
 +  params->body = GetRequestBodyForWebURLRequest(request);
 +
-   params->download_policy.ApplyDownloadFramePolicy(
-       /*is_opener_navigation=*/false, request.HasUserGesture(),
-       // `openee_can_access_opener_origin` only matters for opener navigations,
+   // We preserve this information before sending the message since |params| is
+   // moved on send.
+   bool is_background_tab =
 diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
-index 4379497806bf7c85ade2f4e4554d6a60c4ec966c..fa860bbcf0c12df33dae69d25b01587676a1b79e 100644
+index 2e7c332565ebe33b00ab7fff96a6a8dfc61422a6..0ab061f51d1d0c93f23bfcf5ba051172cea37eb8 100644
 --- a/content/web_test/browser/web_test_content_browser_client.cc
 +++ b/content/web_test/browser/web_test_content_browser_client.cc
@@ -438,6 +438,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
@@ -186,7 +186,7 @@ index 4379497806bf7c85ade2f4e4554d6a60c4ec966c..fa860bbcf0c12df33dae69d25b015876
     bool opener_suppressed,
     bool* no_javascript_access) {
 diff --git a/content/web_test/browser/web_test_content_browser_client.h b/content/web_test/browser/web_test_content_browser_client.h
-index d4eb4d482b2641585d501131c64b90cc9dbcfd18..132a5d86279b9a2cb4364b9c6d3e89e12d55052e 100644
+index 00e2a8c21d4f0ef00c942498251fa44065da63c0..0fc4b092fa276063e05f990bf920fecd60c6d26c 100644
 --- a/content/web_test/browser/web_test_content_browser_client.h
 +++ b/content/web_test/browser/web_test_content_browser_client.h
@@ -80,6 +80,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
@@ -199,13 +199,13 @@ index d4eb4d482b2641585d501131c64b90cc9dbcfd18..132a5d86279b9a2cb4364b9c6d3e89e1
                        bool opener_suppressed,
                        bool* no_javascript_access) override;
 diff --git a/third_party/blink/public/web/web_window_features.h b/third_party/blink/public/web/web_window_features.h
-index 84d32491a56528a84b4395fba1d54cdbb38d522b..09998a83c449ef8cd9f360fbcdcf7edc0bbfa4a9 100644
+index 34570168ccb123f5102dcf8fa6bbf98e7c373ec6..192701e56d258da41b3724292853885e4daf3420 100644
 --- a/third_party/blink/public/web/web_window_features.h
 +++ b/third_party/blink/public/web/web_window_features.h
@@ -34,6 +34,7 @@
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
- #include "third_party/blink/public/platform/web_impression.h"
+ #include "third_party/blink/public/common/navigation/impression.h"
 +#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 
 namespace blink {
@@ -213,21 +213,22 @@ index 84d32491a56528a84b4395fba1d54cdbb38d522b..09998a83c449ef8cd9f360fbcdcf7edc
@@ -68,6 +69,8 @@ struct WebWindowFeatures {
   // Represents the attribution source declared by Attribution Reporting related
   // window features, if any.
-   absl::optional<WebImpression> impression;
+   absl::optional<Impression> impression;
 +
 +  String raw_features;
 };
 
 }  // 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 2e2ba228a7f179b7cf9c43434bd20ca20b1f1af6..de9f95426ad2dcc99bc4961a0e57539d287408e4 100644
+index 84eca5b0b66eda6bebf3fdc304438325545a1f17..2f0615ee1454946d6f46f6626ce9b860a0e04fee 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2074,6 +2074,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
- 
+@@ -2104,6 +2104,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
   WebWindowFeatures window_features =
-       GetWindowFeaturesFromString(features, incumbent_window);
-+  window_features.raw_features = features;
+       GetWindowFeaturesFromString(features, entered_window);
 
+  window_features.raw_features = features;
+
   // In fenced frames, we should always use `noopener`.
   if (GetFrame()->IsInFencedFrameTree()) {
+     window_features.noopener = true;
--- a/patches/chromium/cherry-pick-22c61cfae5d1.patch
+++ b/patches/chromium/cherry-pick-22c61cfae5d1.patch
@@ -1,97 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Austin Sullivan <asully@chromium.org>
-Date: Thu, 12 May 2022 04:52:20 +0000
-Subject: FSA: Sanitize .url files
-
-Bug: 1307930
-Change-Id: I7ed3cca5942a5334ba761d269bdd8961fa9d13fe
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3638698
-Reviewed-by: Marijn Kruisselbrink <mek@chromium.org>
-Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
-Auto-Submit: Austin Sullivan <asully@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1002495}
-
-diff --git a/content/browser/file_system_access/file_system_chooser.cc b/content/browser/file_system_access/file_system_chooser.cc
-index f8cd9d51222c70166a82cdd6dd4b7d0c24970606..8c38f004109aa967e1e5439a17dc35d3013e8ecf 100644
--- a/content/browser/file_system_access/file_system_chooser.cc
-+++ b/content/browser/file_system_access/file_system_chooser.cc
-@@ -275,13 +275,15 @@ bool FileSystemChooser::IsShellIntegratedExtension(
-   base::FilePath::StringType extension_lower =
-       base::ToLowerASCII(GetLastExtension(extension));
- 
-  // .lnk and .scf files may be used to execute arbitrary code (see
-+  // '.lnk' and '.scf' files may be used to execute arbitrary code (see
-   // https://nvd.nist.gov/vuln/detail/CVE-2010-2568 and
-  // https://crbug.com/1227995, respectively). .local files are used by Windows
-  // to determine which DLLs to load for an application.
-+  // https://crbug.com/1227995, respectively). '.local' files are used by
-+  // Windows to determine which DLLs to load for an application. '.url' files
-+  // can be used to read arbirtary files (see https://crbug.com/1307930).
-   if ((extension_lower == FILE_PATH_LITERAL("lnk")) ||
-       (extension_lower == FILE_PATH_LITERAL("local")) ||
-      (extension_lower == FILE_PATH_LITERAL("scf"))) {
-+      (extension_lower == FILE_PATH_LITERAL("scf")) ||
-+      (extension_lower == FILE_PATH_LITERAL("url"))) {
-     return true;
-   }
- 
-diff --git a/content/browser/file_system_access/file_system_chooser_browsertest.cc b/content/browser/file_system_access/file_system_chooser_browsertest.cc
-index 9ea4db7807f6bbac799452fd138848b2a650d6fd..79dda31bd228e785d54e5486bb4417a75ee62b3a 100644
--- a/content/browser/file_system_access/file_system_chooser_browsertest.cc
-+++ b/content/browser/file_system_access/file_system_chooser_browsertest.cc
-@@ -1556,13 +1556,21 @@ IN_PROC_BROWSER_TEST_F(FileSystemChooserBrowserTest, SuggestedName) {
-   name_infos.push_back({"not_matching.jpg", ListValueOf(".txt"), false,
-                         "not_matching.jpg", false});
- 
-  // ".lnk", ".local", and ".scf" extensions should be sanitized.
-  name_infos.push_back({"dangerous_extension.local", ListValueOf(".local"),
-                        true, "dangerous_extension.download", false});
-+  // ".lnk", ".local", ".scf", and ".url" extensions should be sanitized.
-   name_infos.push_back({"dangerous_extension.lnk", ListValueOf(".lnk"), true,
-                         "dangerous_extension.download", false});
-+  name_infos.push_back({"dangerous_extension.lnk", ListValueOf(".LNK"), true,
-+                        "dangerous_extension.download", false});
-+  name_infos.push_back({"dangerous_extension.LNK", ListValueOf(".lnk"), true,
-+                        "dangerous_extension.download", false});
-+  name_infos.push_back({"dangerous_extension.LNK", ListValueOf(".LNK"), true,
-+                        "dangerous_extension.download", false});
-+  name_infos.push_back({"dangerous_extension.local", ListValueOf(".local"),
-+                        true, "dangerous_extension.download", false});
-   name_infos.push_back({"dangerous_extension.scf", ListValueOf(".scf"), true,
-                         "dangerous_extension.download", false});
-+  name_infos.push_back({"dangerous_extension.url", ListValueOf(".url"), true,
-+                        "dangerous_extension.download", false});
-   // Compound extensions ending in a dangerous extension should be sanitized.
-   name_infos.push_back({"dangerous_extension.png.local", ListValueOf(".local"),
-                         true, "dangerous_extension.png.download", false});
-@@ -1570,6 +1578,8 @@ IN_PROC_BROWSER_TEST_F(FileSystemChooserBrowserTest, SuggestedName) {
-                         true, "dangerous_extension.png.download", false});
-   name_infos.push_back({"dangerous_extension.png.scf", ListValueOf(".scf"),
-                         true, "dangerous_extension.png.download", false});
-+  name_infos.push_back({"dangerous_extension.png.url", ListValueOf(".url"),
-+                        true, "dangerous_extension.png.download", false});
-   // Compound extensions not ending in a dangerous extension should not be
-   // sanitized.
-   name_infos.push_back({"dangerous_extension.local.png", ListValueOf(".png"),
-@@ -1578,6 +1588,8 @@ IN_PROC_BROWSER_TEST_F(FileSystemChooserBrowserTest, SuggestedName) {
-                         true, "dangerous_extension.lnk.png", true});
-   name_infos.push_back({"dangerous_extension.scf.png", ListValueOf(".png"),
-                         true, "dangerous_extension.scf.png", true});
-+  name_infos.push_back({"dangerous_extension.url.png", ListValueOf(".png"),
-+                        true, "dangerous_extension.url.png", true});
-   // Invalid characters should be sanitized.
-   name_infos.push_back({R"(inv*l:d\\ch%rבאמת!a<ters🤓.txt)",
-                         ListValueOf(".txt"), true,
-diff --git a/content/browser/file_system_access/file_system_chooser_unittest.cc b/content/browser/file_system_access/file_system_chooser_unittest.cc
-index 9b27d6305bd00a19d94b5ec49f21a7ecff7ddc48..3082c088f9733de9335437278c0d023954a953d9 100644
--- a/content/browser/file_system_access/file_system_chooser_unittest.cc
-+++ b/content/browser/file_system_access/file_system_chooser_unittest.cc
-@@ -189,7 +189,7 @@ TEST_F(FileSystemChooserTest, IgnoreShellIntegratedExtensions) {
-   accepts.emplace_back(blink::mojom::ChooseFileSystemEntryAcceptsOption::New(
-       u"", std::vector<std::string>({}),
-       std::vector<std::string>(
-          {"lnk", "foo.lnk", "foo.bar.local", "text", "local", "scf"})));
-+          {"lnk", "foo.lnk", "foo.bar.local", "text", "local", "scf", "url"})));
-   SyncShowDialog(std::move(accepts), /*include_accepts_all=*/false);
- 
-   ASSERT_TRUE(dialog_params.file_types);
--- a/patches/chromium/cherry-pick-54a7927b19f9.patch
+++ b/patches/chromium/cherry-pick-54a7927b19f9.patch
@@ -1,276 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aaron Leventhal <aleventhal@google.com>
-Date: Tue, 26 Jul 2022 17:36:04 +0000
-Subject: Merge 104: Speculative fix for IsValidCodePointInIndex() range crash
-
-(cherry picked from commit b4d1ce62d7783a9b31a0a2bec1b886a9a6519a40)
-
-Bug: 1333970
-Change-Id: I5a4c78e708357074fdec1f7a18fa928e39f9c51a
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3757922
-Auto-Submit: Aaron Leventhal <aleventhal@chromium.org>
-Reviewed-by: Nektarios Paisios <nektar@chromium.org>
-Commit-Queue: Aaron Leventhal <aleventhal@chromium.org>
-Cr-Original-Commit-Position: refs/heads/main@{#1025405}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3788215
-Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
-Cr-Commit-Position: refs/branch-heads/5112@{#1206}
-Cr-Branched-From: b13d3fe7b3c47a56354ef54b221008afa754412e-refs/heads/main@{#1012729}
-
-diff --git a/content/browser/accessibility/browser_accessibility_manager.cc b/content/browser/accessibility/browser_accessibility_manager.cc
-index 65213c9e3569d6a9f8d74eb655d48c1df5c9356b..d33fb5d5a3e6f741b03270f63aa34e5d58cac850 100644
--- a/content/browser/accessibility/browser_accessibility_manager.cc
-+++ b/content/browser/accessibility/browser_accessibility_manager.cc
-@@ -394,6 +394,10 @@ const ui::AXTreeData& BrowserAccessibilityManager::GetTreeData() const {
-   return ax_tree()->data();
- }
- 
-+std::string BrowserAccessibilityManager::ToString() const {
-+  return GetTreeData().ToString();
-+}
-+
- void BrowserAccessibilityManager::OnWindowFocused() {
-   if (IsRootTree())
-     FireFocusEventsIfNeeded();
-diff --git a/content/browser/accessibility/browser_accessibility_manager.h b/content/browser/accessibility/browser_accessibility_manager.h
-index 92d62b5832d4fc87830b1c2bad7c7b972f1de74e..ca696fd855dcfe45e80e6c070546b19b19d42f69 100644
--- a/content/browser/accessibility/browser_accessibility_manager.h
-+++ b/content/browser/accessibility/browser_accessibility_manager.h
-@@ -225,6 +225,8 @@ class CONTENT_EXPORT BrowserAccessibilityManager
-   // Get the AXTreeData for this frame.
-   const ui::AXTreeData& GetTreeData() const;
- 
-+  std::string ToString() const override;
-+
-   // Called to notify the accessibility manager that its associated native
-   // view got focused.
-   virtual void OnWindowFocused();
-diff --git a/extensions/renderer/api/automation/automation_ax_tree_wrapper.cc b/extensions/renderer/api/automation/automation_ax_tree_wrapper.cc
-index 93f59054158d089fd2754a8b99c0dc5407716e58..c50d65a55b4cadf8a5579ae7aca79f671088796f 100644
--- a/extensions/renderer/api/automation/automation_ax_tree_wrapper.cc
-+++ b/extensions/renderer/api/automation/automation_ax_tree_wrapper.cc
-@@ -4,6 +4,7 @@
- 
- #include "extensions/renderer/api/automation/automation_ax_tree_wrapper.h"
- 
-+#include "automation_ax_tree_wrapper.h"
- #include "base/containers/contains.h"
- #include "base/containers/cxx20_erase.h"
- #include "base/no_destructor.h"
-@@ -573,4 +574,8 @@ ui::AXNode* AutomationAXTreeWrapper::GetParentNodeFromParentTreeAsAXNode()
-   return owner_->GetParent(tree_.root(), &wrapper);
- }
- 
-+std::string AutomationAXTreeWrapper::ToString() const {
-+  return "<AutomationAXTreeWrapper>";
-+}
-+
- }  // namespace extensions
-diff --git a/extensions/renderer/api/automation/automation_ax_tree_wrapper.h b/extensions/renderer/api/automation/automation_ax_tree_wrapper.h
-index afb92e41edb824bf7c642fd2bb542daac653abf8..2c64b5eaac8d2521b0c9ff754b36c057f73f9e90 100644
--- a/extensions/renderer/api/automation/automation_ax_tree_wrapper.h
-+++ b/extensions/renderer/api/automation/automation_ax_tree_wrapper.h
-@@ -116,6 +116,7 @@ class AutomationAXTreeWrapper : public ui::AXTreeObserver,
-   ui::AXTreeID GetParentTreeID() const override;
-   ui::AXNode* GetRootAsAXNode() const override;
-   ui::AXNode* GetParentNodeFromParentTreeAsAXNode() const override;
-+  std::string ToString() const override;
- 
-  private:
-   // AXTreeObserver overrides.
-diff --git a/ui/accessibility/ax_node_position_unittest.cc b/ui/accessibility/ax_node_position_unittest.cc
-index b0f06a0912447e5fa9bad9e62b2523817490ea02..3081258496dacc4f26976dfd99ea005a70bcd210 100644
--- a/ui/accessibility/ax_node_position_unittest.cc
-+++ b/ui/accessibility/ax_node_position_unittest.cc
-@@ -9105,8 +9105,12 @@ TEST_F(AXPositionTest,
-   EXPECT_TRUE(test_position->IsNullPosition());
- }
- 
-+// TODO(crbug.com/1333970) It is not legal to call
-+// AsLeafTextPositionBeforeCharacter or AsLeafTextPositionAfterCharacter with
-+// a text position using out-of-range offsets. It's necessary to call
-+// AsValidPosition() first. Therefore, this test currently triggers a DCHECK.
- TEST_F(AXPositionTest,
-       AsLeafTextPositionBeforeAndAfterCharacterWithInvalidPosition) {
-+       DISABLED_AsLeafTextPositionBeforeAndAfterCharacterWithInvalidPosition) {
-   AXNodeData root_data;
-   root_data.id = 1;
-   root_data.role = ax::mojom::Role::kRootWebArea;
-diff --git a/ui/accessibility/ax_position.h b/ui/accessibility/ax_position.h
-index 9eaf0df84b04e88d9f78e95523732d90ecd0fe22..d23bb61a0713a44e864e6b940c78433d81490776 100644
--- a/ui/accessibility/ax_position.h
-+++ b/ui/accessibility/ax_position.h
-@@ -26,6 +26,7 @@
- #include "base/strings/string_util.h"
- #include "base/strings/utf_string_conversions.h"
- #include "third_party/abseil-cpp/absl/types/optional.h"
-+#include "ui/accessibility/ax_common.h"
- #include "ui/accessibility/ax_enum_util.h"
- #include "ui/accessibility/ax_enums.mojom.h"
- #include "ui/accessibility/ax_node.h"
-@@ -383,16 +384,33 @@ class AXPosition {
-     return str + " annotated_text=" + base::UTF16ToUTF8(annotated_text);
-   }
- 
-+  // Helper for logging the position, the AXTreeManager and the anchor node.
-+  std::string ToDebugString() const {
-+    if (IsNullPosition()) {
-+      return "* Position: null";
-+    }
-+    DCHECK(GetAnchor());
-+    DCHECK(GetManager());
-+    std::ostringstream str;
-+    str << "* Position: " << ToString()
-+        << "\n* Manager: " << GetManager()->ToString()
-+        << "\n* Anchor node: " << *GetAnchor();
-+    return str.str();
-+  }
-+
-   AXPositionKind kind() const { return kind_; }
-   AXTreeID tree_id() const { return tree_id_; }
-   AXNodeID anchor_id() const { return anchor_id_; }
- 
-+  AXTreeManager* GetManager() const {
-+    return AXTreeManagerMap::GetInstance().GetManager(tree_id());
-+  }
-+
-   AXNode* GetAnchor() const {
-     if (tree_id_ == AXTreeIDUnknown() || anchor_id_ == kInvalidAXNodeID)
-       return nullptr;
- 
-    const AXTreeManager* manager =
-        AXTreeManagerMap::GetInstance().GetManager(tree_id());
-+    const AXTreeManager* manager = GetManager();
-     if (manager)
-       return manager->GetNodeFromTree(anchor_id());
- 
-@@ -2569,13 +2587,6 @@ class AXPosition {
-       return Clone();
- 
-     AXPositionInstance text_position = AsTextPosition();
-    // The following situation should not be possible but there are existing
-    // crashes in the field.
-    //
-    // TODO(nektar): Remove this workaround as soon as the source of the bug
-    // is identified.
-    if (text_position->text_offset_ > text_position->MaxTextOffset())
-      return CreateNullPosition();
- 
-     // In case the input affinity is upstream, reset it to downstream.
-     //
-@@ -2593,6 +2604,16 @@ class AXPosition {
-     if (!text_position->IsIgnored() && !text_position->AtEndOfAnchor()) {
-       std::unique_ptr<base::i18n::BreakIterator> grapheme_iterator =
-           text_position->GetGraphemeIterator();
-+      // The following situation should not be possible but there are existing
-+      // crashes in the field.
-+      //
-+      // TODO(nektar): Remove this workaround as soon as the source of the bug
-+      // is identified.
-+      if (text_position->text_offset_ < 0 ||
-+          text_position->text_offset_ > text_position->MaxTextOffset()) {
-+        SANITIZER_NOTREACHED() << "Offset range error:\n" << ToDebugString();
-+        return CreateNullPosition();
-+      }
-       DCHECK_GE(text_position->text_offset_, 0);
-       DCHECK_LE(text_position->text_offset_, text_position->MaxTextOffset());
-       while (!text_position->AtStartOfAnchor() &&
-@@ -2645,9 +2666,11 @@ class AXPosition {
-       //
-       // TODO(nektar): Remove this workaround as soon as the source of the bug
-       // is identified.
-      if (text_position->text_offset_ > text_position->MaxTextOffset())
-+      if (text_position->text_offset_ < 0 ||
-+          text_position->text_offset_ > text_position->MaxTextOffset()) {
-+        SANITIZER_NOTREACHED() << "Offset range error:\n" << ToDebugString();
-         return CreateNullPosition();
-
-+      }
-       DCHECK_GE(text_position->text_offset_, 0);
-       DCHECK_LE(text_position->text_offset_, text_position->MaxTextOffset());
-       while (!text_position->AtEndOfAnchor() &&
-diff --git a/ui/accessibility/ax_tree_manager.h b/ui/accessibility/ax_tree_manager.h
-index 1081ed8fc3388ae7b6f535f2cd7437ac2e3db184..52f892c1acf3a50a24716bb361dd1ca231bd57a1 100644
--- a/ui/accessibility/ax_tree_manager.h
-+++ b/ui/accessibility/ax_tree_manager.h
-@@ -51,6 +51,11 @@ class AX_EXPORT AXTreeManager {
-   // Called when the tree manager is about to be removed from the tree map,
-   // `AXTreeManagerMap`.
-   virtual void WillBeRemovedFromMap() {}
-+
-+  // For debugging.
-+  // TODO(benjamin.beaudry) Instead of this, implement GetTreeData() on all
-+  // AXTreeManager subclasses, and have callers use GetTreeData().ToString();
-+  virtual std::string ToString() const = 0;
- };
- 
- }  // namespace ui
-diff --git a/ui/accessibility/test_ax_tree_manager.cc b/ui/accessibility/test_ax_tree_manager.cc
-index 15627a472481b46c66c3d40efa3895ab14cb89ef..5ee1750a265db3e9291c5f5a9beb1a4228278af2 100644
--- a/ui/accessibility/test_ax_tree_manager.cc
-+++ b/ui/accessibility/test_ax_tree_manager.cc
-@@ -116,4 +116,8 @@ AXNode* TestAXTreeManager::GetParentNodeFromParentTreeAsAXNode() const {
-   return nullptr;
- }
- 
-+std::string TestAXTreeManager::ToString() const {
-+  return "<TestAXTreeManager>";
-+}
-+
- }  // namespace ui
-diff --git a/ui/accessibility/test_ax_tree_manager.h b/ui/accessibility/test_ax_tree_manager.h
-index c155aeb4f164129a3b484386f0e4802a361df80a..dabc5650132d01f121f8a9763afc499800bfbd9c 100644
--- a/ui/accessibility/test_ax_tree_manager.h
-+++ b/ui/accessibility/test_ax_tree_manager.h
-@@ -53,6 +53,7 @@ class AX_EXPORT TestAXTreeManager : public AXTreeManager {
-   AXTreeID GetParentTreeID() const override;
-   AXNode* GetRootAsAXNode() const override;
-   AXNode* GetParentNodeFromParentTreeAsAXNode() const override;
-+  std::string ToString() const override;
- 
-  private:
-   std::unique_ptr<AXTree> tree_;
-diff --git a/ui/views/accessibility/views_ax_tree_manager.cc b/ui/views/accessibility/views_ax_tree_manager.cc
-index 9ddd02d0e05d56247cbeb48d97b26227090a40d3..269002feff50b3c95f7216ba3e5c339bc7e641a4 100644
--- a/ui/views/accessibility/views_ax_tree_manager.cc
-+++ b/ui/views/accessibility/views_ax_tree_manager.cc
-@@ -4,8 +4,6 @@
- 
- #include "ui/views/accessibility/views_ax_tree_manager.h"
- 
-#include <string>
-
- #include "base/bind.h"
- #include "base/callback.h"
- #include "base/check.h"
-@@ -105,6 +103,10 @@ ui::AXNode* ViewsAXTreeManager::GetParentNodeFromParentTreeAsAXNode() const {
-   return nullptr;
- }
- 
-+std::string ViewsAXTreeManager::ToString() const {
-+  return "<ViewsAXTreeManager>";
-+}
-+
- void ViewsAXTreeManager::OnViewEvent(View* view, ax::mojom::Event event) {
-   DCHECK(view);
-   AXAuraObjWrapper* wrapper = cache_.GetOrCreate(view);
-diff --git a/ui/views/accessibility/views_ax_tree_manager.h b/ui/views/accessibility/views_ax_tree_manager.h
-index 3c28a84ddcbddccc8e9d4ae6fd2a30cd4c29bc65..6a6a769f5280ac901df551a85c4de69fa4e8eeed 100644
--- a/ui/views/accessibility/views_ax_tree_manager.h
-+++ b/ui/views/accessibility/views_ax_tree_manager.h
-@@ -7,6 +7,7 @@
- 
- #include <memory>
- #include <set>
-+#include <string>
- #include <vector>
- 
- #include "base/callback_forward.h"
-@@ -89,6 +90,7 @@ class VIEWS_EXPORT ViewsAXTreeManager : public ui::AXTreeManager,
-   ui::AXTreeID GetParentTreeID() const override;
-   ui::AXNode* GetRootAsAXNode() const override;
-   ui::AXNode* GetParentNodeFromParentTreeAsAXNode() const override;
-+  std::string ToString() const override;
- 
-   // AXActionHandlerBase implementation.
-   void PerformAction(const ui::AXActionData& data) override;
--- a/patches/chromium/cherry-pick-54e32332750c.patch
+++ b/patches/chromium/cherry-pick-54e32332750c.patch
@@ -1,141 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Min Qin <qinmin@chromium.org>
-Date: Tue, 12 Jul 2022 19:48:53 +0000
-Subject: Sanitize default file name in windows select file dialog
-
-On windows, '%' is a special character and can be used for environment
-variables. So if the default file name is '%DATADIR%', it can actually
-refer to another directory and thus causing weird behaviors.
-And '%' cannot be escaped when used in the file dialog. Both "^%" and
-"%%" don't work. This CL mitigates the issue by replacing '%' with '_'.
-This only affects the default file name when showing the dialog. Power
-users can still change the file name by adding '%' if needed.
-
-BUG=1308422
-
-(cherry picked from commit 9cdce354cb3b0da5b4b311638973d407be7712b6)
-
-Change-Id: Ibb275f5c3c2c9458c20d1e97ad527f7c95184eaa
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3688608
-Reviewed-by: Robert Liao <robliao@chromium.org>
-Commit-Queue: Min Qin <qinmin@chromium.org>
-Cr-Original-Commit-Position: refs/heads/main@{#1014602}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3758469
-Cr-Commit-Position: refs/branch-heads/5112@{#822}
-Cr-Branched-From: b13d3fe7b3c47a56354ef54b221008afa754412e-refs/heads/main@{#1012729}
-
-diff --git a/ui/shell_dialogs/execute_select_file_win.cc b/ui/shell_dialogs/execute_select_file_win.cc
-index 063d4c7c96cba45448d4d7b0e7a8ddd3a6f67937..162dbc3aeb4ead16a415228b40fb67008e89fe63 100644
--- a/ui/shell_dialogs/execute_select_file_win.cc
-+++ b/ui/shell_dialogs/execute_select_file_win.cc
-@@ -10,6 +10,7 @@
- #include "base/callback.h"
- #include "base/files/file.h"
- #include "base/files/file_util.h"
-+#include "base/strings/string_tokenizer.h"
- #include "base/strings/string_util.h"
- #include "base/win/com_init_util.h"
- #include "base/win/registry.h"
-@@ -50,7 +51,7 @@ bool SetDefaultPath(IFileDialog* file_dialog,
-     default_folder = default_path;
-   } else {
-     default_folder = default_path.DirName();
-    default_file_name = default_path.BaseName();
-+    default_file_name = GetSanitizedFileName(default_path.BaseName());
-   }
- 
-   // Do not fail the file dialog operation if the specified folder is invalid.
-@@ -371,6 +372,33 @@ std::wstring AppendExtensionIfNeeded(const std::wstring& filename,
-   return return_value;
- }
- 
-+base::FilePath GetSanitizedFileName(const base::FilePath& file_name) {
-+  base::StringTokenizerT<std::wstring, std::wstring::const_iterator> t(
-+      file_name.value(), L"%");
-+  t.set_options(base::StringTokenizer::RETURN_EMPTY_TOKENS);
-+  std::wstring result;
-+  bool token_valid = t.GetNext();
-+  while (token_valid) {
-+    // Append substring before the first "%".
-+    result.append(t.token());
-+    // Done if we are reaching the end delimiter,
-+    if (!t.GetNext()) {
-+      break;
-+    }
-+    std::wstring string_after_first_percent = t.token();
-+    token_valid = t.GetNext();
-+    // If there are no other "%", append the string after
-+    // the first "%". Otherwise, remove the string between
-+    // the "%" and continue handing the remaining string.
-+    if (!token_valid) {
-+      result.append(L"%");
-+      result.append(string_after_first_percent);
-+      break;
-+    }
-+  }
-+  return base::FilePath(result);
-+}
-+
- void ExecuteSelectFile(
-     SelectFileDialog::Type type,
-     const std::u16string& title,
-diff --git a/ui/shell_dialogs/execute_select_file_win.h b/ui/shell_dialogs/execute_select_file_win.h
-index dc808af395333a2bd81c2bd73faac4c6063fd409..8fa96906c0288d0021c1500bd442a35c0c29dfd2 100644
--- a/ui/shell_dialogs/execute_select_file_win.h
-+++ b/ui/shell_dialogs/execute_select_file_win.h
-@@ -26,6 +26,12 @@ SHELL_DIALOGS_EXPORT std::wstring AppendExtensionIfNeeded(
-     const std::wstring& filter_selected,
-     const std::wstring& suggested_ext);
- 
-+// Given a file name, return the sanitized version by removing substrings that
-+// are embedded in double '%' characters as those are reserved for environment
-+// variables. Implementation detail exported for unit tests.
-+SHELL_DIALOGS_EXPORT base::FilePath GetSanitizedFileName(
-+    const base::FilePath& file_name);
-+
- // Describes a filter for a file dialog.
- struct FileFilterSpec {
-   // A human readable description of this filter. E.g. "HTML Files."
-diff --git a/ui/shell_dialogs/execute_select_file_win_unittest.cc b/ui/shell_dialogs/execute_select_file_win_unittest.cc
-index df5e8a89d9b0854626a99750a56e3f2500dba812..b6c604fa5a798ba6e448e892ca7a9212cce507fc 100644
--- a/ui/shell_dialogs/execute_select_file_win_unittest.cc
-+++ b/ui/shell_dialogs/execute_select_file_win_unittest.cc
-@@ -50,3 +50,38 @@ TEST(ShellDialogsWin, AppendExtensionIfNeeded) {
-                                           test_cases[i].suggested_ext));
-   }
- }
-+
-+TEST(ShellDialogsWin, GetSanitizedFileName) {
-+  struct GetSanitizedFileNameTestCase {
-+    const wchar_t* filename;
-+    const wchar_t* sanitized_filename;
-+  } test_cases[] = {
-+      {L"", L""},
-+      {L"a.txt", L"a.txt"},
-+
-+      // Only 1 "%" in file name.
-+      {L"%", L"%"},
-+      {L"%.txt", L"%.txt"},
-+      {L"ab%c.txt", L"ab%c.txt"},
-+      {L"abc.t%", L"abc.t%"},
-+
-+      // 2 "%" in file name.
-+      {L"%%", L""},
-+      {L"%c%", L""},
-+      {L"%c%d", L"d"},
-+      {L"d%c%.txt", L"d.txt"},
-+      {L"ab%c.t%", L"ab"},
-+      {L"abc.%t%", L"abc."},
-+
-+      // More than 2 "%" in file name.
-+      {L"%ab%c%.txt", L"c%.txt"},
-+      {L"%abc%.%txt%", L"."},
-+      {L"%ab%c%.%txt%", L"ctxt%"},
-+  };
-+
-+  for (size_t i = 0; i < std::size(test_cases); ++i) {
-+    SCOPED_TRACE(base::StringPrintf("i=%zu", i));
-+    EXPECT_EQ(base::FilePath(test_cases[i].sanitized_filename),
-+              ui::GetSanitizedFileName(base::FilePath(test_cases[i].filename)));
-+  }
-+}
--- a/patches/chromium/cherry-pick-60d8559e150a.patch
+++ b/patches/chromium/cherry-pick-60d8559e150a.patch
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lei Zhang <thestig@chromium.org>
-Date: Tue, 12 Jul 2022 18:52:14 +0000
-Subject: M104: Better define "first result" in PDFiumEngine::AddFindResult().
-
-Currently, changing the PDF layout confuses AddFindResult() and causes
-it to fail a DCHECK(). Adjust AddFindResult() to avoid the failing
-DCHECK().
-
-This is a cherry-pick of https://crrev.com/1021389 without the test
-changes.
-
-Bug: 1339745
-Change-Id: I25c2b6b436700f9aeca4924fef662ad2909f0a8c
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3758626
-Reviewed-by: K. Moon <kmoon@chromium.org>
-Commit-Queue: Lei Zhang <thestig@chromium.org>
-Cr-Commit-Position: refs/branch-heads/5112@{#820}
-Cr-Branched-From: b13d3fe7b3c47a56354ef54b221008afa754412e-refs/heads/main@{#1012729}
-
-diff --git a/pdf/pdfium/pdfium_engine.cc b/pdf/pdfium/pdfium_engine.cc
-index c015d4b06a44c9121576d14160b84e871081fa33..0afe3c60715c948c7e376f81646c11b29cc01486 100644
--- a/pdf/pdfium/pdfium_engine.cc
-+++ b/pdf/pdfium/pdfium_engine.cc
-@@ -1971,7 +1971,7 @@ void PDFiumEngine::SearchUsingICU(const std::u16string& term,
- }
- 
- void PDFiumEngine::AddFindResult(const PDFiumRange& result) {
-  bool first_result = find_results_.empty();
-+  bool first_result = find_results_.empty() && !resume_find_index_.has_value();
-   // Figure out where to insert the new location, since we could have
-   // started searching midway and now we wrapped.
-   size_t result_index;
-@@ -1988,7 +1988,6 @@ void PDFiumEngine::AddFindResult(const PDFiumRange& result) {
-   UpdateTickMarks();
-   client_->NotifyNumberOfFindResultsChanged(find_results_.size(), false);
-   if (first_result) {
-    DCHECK(!resume_find_index_);
-     DCHECK(!current_find_index_);
-     SelectFindResult(/*forward=*/true);
-   }
--- a/patches/chromium/cherry-pick-94a8bdafc8c6.patch
+++ b/patches/chromium/cherry-pick-94a8bdafc8c6.patch
@@ -1,414 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Keren Zhu <kerenzhu@chromium.org>
-Date: Thu, 9 Jun 2022 14:50:26 +0000
-Subject: Fix use-after-free vulnerability in ComboboxModel
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Stop the Combobox from observing the model when the model gets
-destroyed. This is done by adding a virtual OnComboboxModelDestroying()
-to the base observer class and calling it in ~ComboboxModel().
-
-This fix will prevent the use-after-free that happens when the combobox outlives the model, usually because the model lifetime
-is managed by non-UI component.
-
-Bug: 1264288
-Change-Id: Ia00881a9b674bbc83bbf54dd228490c1cc1290bc
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3693825
-Commit-Queue: Keren Zhu <kerenzhu@chromium.org>
-Reviewed-by: Matthias Körber <koerber@google.com>
-Auto-Submit: Keren Zhu <kerenzhu@chromium.org>
-Reviewed-by: Peter Boström <pbos@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1012504}
-
-diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc
-index 323f85651611ff98e45884e3b0b7211eaa25039b..0d0bb0d21b1d96841a30bfea336af918b6da83f8 100644
--- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc
-+++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc
-@@ -130,16 +130,6 @@ int RecentlyUsedFoldersComboModel::GetDefaultIndex() const {
-   return it == items_.end() ? 0 : static_cast<int>(it - items_.begin());
- }
- 
-void RecentlyUsedFoldersComboModel::AddObserver(
-    ui::ComboboxModelObserver* observer) {
-  observers_.AddObserver(observer);
-}
-
-void RecentlyUsedFoldersComboModel::RemoveObserver(
-    ui::ComboboxModelObserver* observer) {
-  observers_.RemoveObserver(observer);
-}
-
- void RecentlyUsedFoldersComboModel::BookmarkModelLoaded(BookmarkModel* model,
-                                                         bool ids_reassigned) {}
- 
-@@ -176,7 +166,7 @@ void RecentlyUsedFoldersComboModel::OnWillRemoveBookmarks(
-     }
-   }
-   if (changed) {
-    for (ui::ComboboxModelObserver& observer : observers_)
-+    for (ui::ComboboxModelObserver& observer : observers())
-       observer.OnComboboxModelChanged(this);
-   }
- }
-@@ -219,7 +209,7 @@ void RecentlyUsedFoldersComboModel::BookmarkAllUserNodesRemoved(
-     }
-   }
-   if (changed) {
-    for (ui::ComboboxModelObserver& observer : observers_)
-+    for (ui::ComboboxModelObserver& observer : observers())
-       observer.OnComboboxModelChanged(this);
-   }
- }
-diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
-index 8682e750f4407e615264986024e2a7dd0bae038f..0c02c685a02875c7b91ca9e6228864bc04e45c10 100644
--- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
-+++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
-@@ -38,8 +38,6 @@ class RecentlyUsedFoldersComboModel : public ui::ComboboxModel,
-   std::u16string GetItemAt(int index) const override;
-   bool IsItemSeparatorAt(int index) const override;
-   int GetDefaultIndex() const override;
-  void AddObserver(ui::ComboboxModelObserver* observer) override;
-  void RemoveObserver(ui::ComboboxModelObserver* observer) override;
- 
-   // Overriden from bookmarks::BookmarkModelObserver:
-   void BookmarkModelLoaded(bookmarks::BookmarkModel* model,
-@@ -90,8 +88,6 @@ class RecentlyUsedFoldersComboModel : public ui::ComboboxModel,
-   const raw_ptr<bookmarks::BookmarkModel> bookmark_model_;
- 
-   const raw_ptr<const bookmarks::BookmarkNode> parent_node_;
-
-  base::ObserverList<ui::ComboboxModelObserver> observers_;
- };
- 
- #endif  // CHROME_BROWSER_UI_BOOKMARKS_RECENTLY_USED_FOLDERS_COMBO_MODEL_H_
-diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
-index 60455386b7d5f1da72c92424ccf95fd971e7590a..3bfe6852b8a54a53aafea5eeec2da850097b2f0a 100644
--- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
-+++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
-@@ -41,6 +41,8 @@ class TestComboboxModelObserver : public ui::ComboboxModelObserver {
-     changed_ = true;
-   }
- 
-+  void OnComboboxModelDestroying(ui::ComboboxModel* model) override {}
-+
-  private:
-   bool changed_;
- };
-diff --git a/components/autofill/core/browser/ui/address_combobox_model.cc b/components/autofill/core/browser/ui/address_combobox_model.cc
-index c7e6f906ff32cb198f8723d6678971ae6cff28a2..d52dc0e925c54634452f86ca90792b318776e895 100644
--- a/components/autofill/core/browser/ui/address_combobox_model.cc
-+++ b/components/autofill/core/browser/ui/address_combobox_model.cc
-@@ -84,14 +84,6 @@ int AddressComboboxModel::GetDefaultIndex() const {
-   return ui::ComboboxModel::GetDefaultIndex();
- }
- 
-void AddressComboboxModel::AddObserver(ui::ComboboxModelObserver* observer) {
-  observers_.AddObserver(observer);
-}
-
-void AddressComboboxModel::RemoveObserver(ui::ComboboxModelObserver* observer) {
-  observers_.RemoveObserver(observer);
-}
-
- int AddressComboboxModel::AddNewProfile(const AutofillProfile& profile) {
-   profiles_cache_.push_back(std::make_unique<AutofillProfile>(profile));
-   UpdateAddresses();
-@@ -131,7 +123,7 @@ void AddressComboboxModel::UpdateAddresses() {
-   for (size_t i = 0; i < profiles_cache_.size(); ++i)
-     addresses_.emplace_back(profiles_cache_[i]->guid(), labels[i]);
- 
-  for (auto& observer : observers_) {
-+  for (auto& observer : observers()) {
-     observer.OnComboboxModelChanged(this);
-   }
- }
-diff --git a/components/autofill/core/browser/ui/address_combobox_model.h b/components/autofill/core/browser/ui/address_combobox_model.h
-index 02d65209d2729deae608481411e1539ba08f5f7e..3a41b30c92543633da29e40e2c64cc4597e322d2 100644
--- a/components/autofill/core/browser/ui/address_combobox_model.h
-+++ b/components/autofill/core/browser/ui/address_combobox_model.h
-@@ -40,8 +40,6 @@ class AddressComboboxModel : public ui::ComboboxModel {
-   std::u16string GetItemAt(int index) const override;
-   bool IsItemSeparatorAt(int index) const override;
-   int GetDefaultIndex() const override;
-  void AddObserver(ui::ComboboxModelObserver* observer) override;
-  void RemoveObserver(ui::ComboboxModelObserver* observer) override;
- 
-   // Adds |profile| to model and return its combobox index. The lifespan of
-   // |profile| beyond this call is undefined so a copy must be made.
-@@ -72,9 +70,6 @@ class AddressComboboxModel : public ui::ComboboxModel {
- 
-   // If non empty, the guid of the address that should be selected by default.
-   std::string default_selected_guid_;
-
-  // To be called when the data for the given country code was loaded.
-  base::ObserverList<ui::ComboboxModelObserver> observers_;
- };
- 
- }  // namespace autofill
-diff --git a/components/autofill/core/browser/ui/region_combobox_model.cc b/components/autofill/core/browser/ui/region_combobox_model.cc
-index 6439ccb1f074f1c3965dfb2b45ab6f6636437c17..42626aff427f1b3f3400aba399e3f9c89faa06ba 100644
--- a/components/autofill/core/browser/ui/region_combobox_model.cc
-+++ b/components/autofill/core/browser/ui/region_combobox_model.cc
-@@ -67,14 +67,6 @@ bool RegionComboboxModel::IsItemSeparatorAt(int index) const {
-   return regions_[index].first.empty();
- }
- 
-void RegionComboboxModel::AddObserver(ui::ComboboxModelObserver* observer) {
-  observers_.AddObserver(observer);
-}
-
-void RegionComboboxModel::RemoveObserver(ui::ComboboxModelObserver* observer) {
-  observers_.RemoveObserver(observer);
-}
-
- void RegionComboboxModel::OnRegionDataLoaded(
-     const std::vector<const ::i18n::addressinput::RegionData*>& regions) {
-   // The RegionDataLoader will eventually self destruct after this call.
-@@ -95,7 +87,7 @@ void RegionComboboxModel::OnRegionDataLoaded(
-     failed_to_load_data_ = true;
-   }
- 
-  for (auto& observer : observers_) {
-+  for (auto& observer : observers()) {
-     observer.OnComboboxModelChanged(this);
-   }
- }
-diff --git a/components/autofill/core/browser/ui/region_combobox_model.h b/components/autofill/core/browser/ui/region_combobox_model.h
-index d1b5d8b9db0c4d9d15e4f2a50a6cba38b33f1be8..52cffd5d00649f8e2be7189bca128ba4c3e8a97d 100644
--- a/components/autofill/core/browser/ui/region_combobox_model.h
-+++ b/components/autofill/core/browser/ui/region_combobox_model.h
-@@ -54,8 +54,6 @@ class RegionComboboxModel : public ui::ComboboxModel {
-   int GetItemCount() const override;
-   std::u16string GetItemAt(int index) const override;
-   bool IsItemSeparatorAt(int index) const override;
-  void AddObserver(ui::ComboboxModelObserver* observer) override;
-  void RemoveObserver(ui::ComboboxModelObserver* observer) override;
- 
-  private:
-   // Callback for the RegionDataLoader.
-@@ -72,9 +70,6 @@ class RegionComboboxModel : public ui::ComboboxModel {
-   // List of <code, name> pairs for ADDRESS_HOME_STATE combobox values;
-   std::vector<std::pair<std::string, std::string>> regions_;
- 
-  // To be called when the data for the given country code was loaded.
-  base::ObserverList<ui::ComboboxModelObserver> observers_;
-
-   // Weak pointer factory.
-   base::WeakPtrFactory<RegionComboboxModel> weak_factory_{this};
- };
-diff --git a/ui/base/models/combobox_model.cc b/ui/base/models/combobox_model.cc
-index d307ee0ec592ae01a1d04cef85c0a492b7f7e29e..413adebd0349e304006de0cc0c4e2a4536ebbf06 100644
--- a/ui/base/models/combobox_model.cc
-+++ b/ui/base/models/combobox_model.cc
-@@ -4,10 +4,18 @@
- 
- #include "ui/base/models/combobox_model.h"
- 
-+#include "ui/base/models/combobox_model_observer.h"
- #include "ui/base/models/image_model.h"
- 
- namespace ui {
- 
-+ComboboxModel::ComboboxModel() = default;
-+
-+ComboboxModel::~ComboboxModel() {
-+  for (auto& observer : observers_)
-+    observer.OnComboboxModelDestroying(this);
-+}
-+
- std::u16string ComboboxModel::GetDropDownTextAt(int index) const {
-   return GetItemAt(index);
- }
-@@ -36,4 +44,12 @@ bool ComboboxModel::IsItemEnabledAt(int index) const {
-   return true;
- }
- 
-+void ComboboxModel::AddObserver(ComboboxModelObserver* observer) {
-+  observers_.AddObserver(observer);
-+}
-+
-+void ComboboxModel::RemoveObserver(ComboboxModelObserver* observer) {
-+  observers_.RemoveObserver(observer);
-+}
-+
- }  // namespace ui
-diff --git a/ui/base/models/combobox_model.h b/ui/base/models/combobox_model.h
-index 5264aaa5550859fce39a8485feff16c8fd83d897..eeff7dc8444e77fd598eb7ce05ab18259a9d7ef5 100644
--- a/ui/base/models/combobox_model.h
-+++ b/ui/base/models/combobox_model.h
-@@ -8,6 +8,7 @@
- #include <string>
- 
- #include "base/component_export.h"
-+#include "base/observer_list.h"
- 
- namespace ui {
- 
-@@ -17,7 +18,8 @@ class ImageModel;
- // A data model for a combo box.
- class COMPONENT_EXPORT(UI_BASE) ComboboxModel {
-  public:
-  virtual ~ComboboxModel() {}
-+  ComboboxModel();
-+  virtual ~ComboboxModel();
- 
-   // Returns the number of items in the combo box.
-   virtual int GetItemCount() const = 0;
-@@ -52,9 +54,17 @@ class COMPONENT_EXPORT(UI_BASE) ComboboxModel {
-   // Returns true if the item at |index| is enabled.
-   virtual bool IsItemEnabledAt(int index) const;
- 
-  // Adds/removes an observer. Override if model supports mutation.
-  virtual void AddObserver(ComboboxModelObserver* observer) {}
-  virtual void RemoveObserver(ComboboxModelObserver* observer) {}
-+  // Adds/removes an observer.
-+  void AddObserver(ComboboxModelObserver* observer);
-+  void RemoveObserver(ComboboxModelObserver* observer);
-+
-+ protected:
-+  base::ObserverList<ui::ComboboxModelObserver>& observers() {
-+    return observers_;
-+  }
-+
-+ private:
-+  base::ObserverList<ui::ComboboxModelObserver> observers_;
- };
- 
- }  // namespace ui
-diff --git a/ui/base/models/combobox_model_observer.h b/ui/base/models/combobox_model_observer.h
-index 5e00ab68a0c14d0b48317ca287e3f105351a102c..44325ff0aa94b75eb662be1637f44aa5524a33e8 100644
--- a/ui/base/models/combobox_model_observer.h
-+++ b/ui/base/models/combobox_model_observer.h
-@@ -16,10 +16,13 @@ class ComboboxModel;
- class COMPONENT_EXPORT(UI_BASE) ComboboxModelObserver
-     : public base::CheckedObserver {
-  public:
-  // Invoked when |model| has changed in some way. The observer should assume
-+  // Invoked when `model` has changed in some way. The observer should assume
-   // everything changed.
-   virtual void OnComboboxModelChanged(ComboboxModel* model) = 0;
- 
-+  // Invoked when `model` is destroyed. The observer should stop observing.
-+  virtual void OnComboboxModelDestroying(ComboboxModel* model) = 0;
-+
-  protected:
-   ~ComboboxModelObserver() override = default;
- };
-diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
-index aa135250e469d2405fba618c96b0bf38acaf59f0..b8d41cfeb67f3b4c098b2b329b2dfa7fe246dabb 100644
--- a/ui/views/controls/combobox/combobox.cc
-+++ b/ui/views/controls/combobox/combobox.cc
-@@ -578,6 +578,10 @@ void Combobox::OnComboboxModelChanged(ui::ComboboxModel* model) {
-   OnContentSizeMaybeChanged();
- }
- 
-+void Combobox::OnComboboxModelDestroying(ui::ComboboxModel* model) {
-+  SetModel(nullptr);
-+}
-+
- const base::RepeatingClosure& Combobox::GetCallback() const {
-   return callback_;
- }
-diff --git a/ui/views/controls/combobox/combobox.h b/ui/views/controls/combobox/combobox.h
-index fc77f8e49cead5fb689fba3d56c65c1b8e69f298..1a3f533256eca91e4fd4552ee5425b7ca8e7ad7e 100644
--- a/ui/views/controls/combobox/combobox.h
-+++ b/ui/views/controls/combobox/combobox.h
-@@ -131,6 +131,7 @@ class VIEWS_EXPORT Combobox : public View,
-  protected:
-   // Overridden from ComboboxModelObserver:
-   void OnComboboxModelChanged(ui::ComboboxModel* model) override;
-+  void OnComboboxModelDestroying(ui::ComboboxModel* model) override;
- 
-   // Getters to be used by metadata.
-   const base::RepeatingClosure& GetCallback() const;
-diff --git a/ui/views/controls/combobox/combobox_unittest.cc b/ui/views/controls/combobox/combobox_unittest.cc
-index 7ce20acc4b3ecd6470d5f017f9171d0be35c09d2..91661f33074d3453b4f28a410ecc918b793f86c6 100644
--- a/ui/views/controls/combobox/combobox_unittest.cc
-+++ b/ui/views/controls/combobox/combobox_unittest.cc
-@@ -84,13 +84,6 @@ class TestComboboxModel : public ui::ComboboxModel {
-     return 0;
-   }
- 
-  void AddObserver(ui::ComboboxModelObserver* observer) override {
-    observers_.AddObserver(observer);
-  }
-  void RemoveObserver(ui::ComboboxModelObserver* observer) override {
-    observers_.RemoveObserver(observer);
-  }
-
-   void SetSeparators(const std::set<int>& separators) {
-     separators_ = separators;
-     OnModelChanged();
-@@ -103,11 +96,10 @@ class TestComboboxModel : public ui::ComboboxModel {
- 
-  private:
-   void OnModelChanged() {
-    for (auto& observer : observers_)
-+    for (auto& observer : observers())
-       observer.OnComboboxModelChanged(this);
-   }
- 
-  base::ObserverList<ui::ComboboxModelObserver> observers_;
-   std::set<int> separators_;
-   int item_count_ = kItemCount;
- };
-@@ -134,20 +126,13 @@ class VectorComboboxModel : public ui::ComboboxModel {
-   }
-   bool IsItemSeparatorAt(int index) const override { return false; }
-   int GetDefaultIndex() const override { return default_index_; }
-  void AddObserver(ui::ComboboxModelObserver* observer) override {
-    observers_.AddObserver(observer);
-  }
-  void RemoveObserver(ui::ComboboxModelObserver* observer) override {
-    observers_.RemoveObserver(observer);
-  }
- 
-   void ValuesChanged() {
-    for (auto& observer : observers_)
-+    for (auto& observer : observers())
-       observer.OnComboboxModelChanged(this);
-   }
- 
-  private:
-  base::ObserverList<ui::ComboboxModelObserver> observers_;
-   int default_index_ = 0;
-   const raw_ptr<std::vector<std::string>> values_;
- };
-@@ -884,6 +869,15 @@ TEST_F(ComboboxTest, SetTooltipTextNotifiesAccessibilityEvent) {
-   EXPECT_EQ(test_tooltip_text, ASCIIToUTF16(name));
- }
- 
-+// Regression test for crbug.com/1264288.
-+// Should fail in ASan build before the fix.
-+TEST_F(ComboboxTest, NoCrashWhenComboboxOutlivesModel) {
-+  auto model = std::make_unique<TestComboboxModel>();
-+  auto combobox = std::make_unique<TestCombobox>(model.get());
-+  model.reset();
-+  combobox.reset();
-+}
-+
- namespace {
- 
- using ComboboxDefaultTest = ViewsTestBase;
-diff --git a/ui/views/controls/editable_combobox/editable_combobox.cc b/ui/views/controls/editable_combobox/editable_combobox.cc
-index b5301bfb0a3c8da3daa1d3646c2f4872cef2cdab..faac607fefcc8caf572eb83456e7520146c1d0ad 100644
--- a/ui/views/controls/editable_combobox/editable_combobox.cc
-+++ b/ui/views/controls/editable_combobox/editable_combobox.cc
-@@ -190,10 +190,15 @@ class EditableCombobox::EditableComboboxMenuModel
-     return combobox_model_->GetDropDownIconAt(items_shown_[index].index);
-   }
- 
-+  // ComboboxModelObserver:
-   void OnComboboxModelChanged(ui::ComboboxModel* model) override {
-     UpdateItemsShown();
-   }
- 
-+  void OnComboboxModelDestroying(ui::ComboboxModel* model) override {
-+    observation_.Reset();
-+  }
-+
-   int GetItemCount() const override { return items_shown_.size(); }
- 
-  private:
--- a/patches/chromium/cherry-pick-bd9724c9fe63.patch
+++ b/patches/chromium/cherry-pick-bd9724c9fe63.patch
@@ -1,203 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Min Qin <qinmin@chromium.org>
-Date: Tue, 28 Jun 2022 16:27:43 +0000
-Subject: passing update_first_party_url_on_redirect=false for fetch
-
-Background fetch doesn't work like regular download as it is not
-considered a top frame navigation. This CL let background fetch to
-pass update_first_party_url_on_redirect=false to DownloadURLParameters,
-and handle it properly w.r.t samesite cookies.
-
-BUG=1268580
-
-(cherry picked from commit bf1e93c6af21dad12088b615feda07a90a85c158)
-
-Change-Id: I3a1cc33be8578d5d8c796dbbb21fa35a47bdda36
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3712307
-Reviewed-by: Rayan Kanso <rayankans@chromium.org>
-Commit-Queue: Min Qin <qinmin@chromium.org>
-Cr-Original-Commit-Position: refs/heads/main@{#1016316}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3727786
-Cr-Commit-Position: refs/branch-heads/5112@{#397}
-Cr-Branched-From: b13d3fe7b3c47a56354ef54b221008afa754412e-refs/heads/main@{#1012729}
-
-diff --git a/components/background_fetch/background_fetch_delegate_base.cc b/components/background_fetch/background_fetch_delegate_base.cc
-index 5f88192eb4e92d4c41c79db188b8b9982f005258..26f7716ae83b70cdcf7cdb23652c2c56d7dc27bf 100644
--- a/components/background_fetch/background_fetch_delegate_base.cc
-+++ b/components/background_fetch/background_fetch_delegate_base.cc
-@@ -101,6 +101,7 @@ void BackgroundFetchDelegateBase::DownloadUrl(
-                           weak_ptr_factory_.GetWeakPtr());
-   params.traffic_annotation =
-       net::MutableNetworkTrafficAnnotationTag(traffic_annotation);
-+  params.request_params.update_first_party_url_on_redirect = false;
- 
-   JobDetails* job_details = GetJobDetails(job_id);
-   if (job_details->job_state == JobDetails::State::kPendingWillStartPaused ||
-diff --git a/components/download/content/internal/download_driver_impl.cc b/components/download/content/internal/download_driver_impl.cc
-index 2b2da55b06e3b4859f439d5b3bf7013b981b75a0..b207ce5c6bd3c332a34885e1dc58cc11d91fe31c 100644
--- a/components/download/content/internal/download_driver_impl.cc
-+++ b/components/download/content/internal/download_driver_impl.cc
-@@ -229,6 +229,8 @@ void DownloadDriverImpl::Start(
-     download_url_params->set_isolation_info(
-         request_params.isolation_info.value());
-   }
-+  download_url_params->set_update_first_party_url_on_redirect(
-+      request_params.update_first_party_url_on_redirect);
- 
-   download_manager_coordinator_->DownloadUrl(std::move(download_url_params));
- }
-diff --git a/components/download/internal/common/download_utils.cc b/components/download/internal/common/download_utils.cc
-index 11f524861320eae8ab694022d97a6fe2ac7366ce..454326720b5c88cc61e4527790797fd7f522014d 100644
--- a/components/download/internal/common/download_utils.cc
-+++ b/components/download/internal/common/download_utils.cc
-@@ -386,8 +386,10 @@ std::unique_ptr<network::ResourceRequest> CreateResourceRequest(
-     // cross-site URL has been visited before.
-     url::Origin origin = url::Origin::Create(params->url());
-     request->trusted_params->isolation_info = net::IsolationInfo::Create(
-        net::IsolationInfo::RequestType::kMainFrame, origin, origin,
-        net::SiteForCookies::FromOrigin(origin));
-+        params->update_first_party_url_on_redirect()
-+            ? net::IsolationInfo::RequestType::kMainFrame
-+            : net::IsolationInfo::RequestType::kOther,
-+        origin, origin, net::SiteForCookies::FromOrigin(origin));
-     request->site_for_cookies = net::SiteForCookies::FromUrl(params->url());
-   }
- 
-@@ -395,7 +397,8 @@ std::unique_ptr<network::ResourceRequest> CreateResourceRequest(
-   request->referrer = params->referrer();
-   request->referrer_policy = params->referrer_policy();
-   request->is_outermost_main_frame = true;
-  request->update_first_party_url_on_redirect = true;
-+  request->update_first_party_url_on_redirect =
-+      params->update_first_party_url_on_redirect();
- 
-   // Downloads should be treated as navigations from Fetch spec perspective.
-   // See also:
-diff --git a/components/download/public/background_service/download_params.h b/components/download/public/background_service/download_params.h
-index 8b911276e757ee889ed05a3fd60cc365ad8f1982..a976d470094462be735e81cf097f32b34c258270 100644
--- a/components/download/public/background_service/download_params.h
-+++ b/components/download/public/background_service/download_params.h
-@@ -126,6 +126,12 @@ struct RequestParams {
-   // be invalidate during download resumption in new browser session. Not
-   // supported on iOS.
-   absl::optional<net::IsolationInfo> isolation_info;
-+
-+  // First-party URL redirect policy: During server redirects, whether the
-+  // first-party URL for cookies will need to be changed. Download is normally
-+  // considered a main frame navigation. However, this is not true for
-+  // background fetch.
-+  bool update_first_party_url_on_redirect = true;
- };
- 
- // The parameters that describe a download request made to the DownloadService.
-diff --git a/components/download/public/common/download_url_parameters.cc b/components/download/public/common/download_url_parameters.cc
-index 3dec7148d86cd3892670df8b95dcb78d49616e89..25ea6f13e0df9f23364b75c48b870d8ea6a53e92 100644
--- a/components/download/public/common/download_url_parameters.cc
-+++ b/components/download/public/common/download_url_parameters.cc
-@@ -34,7 +34,8 @@ DownloadUrlParameters::DownloadUrlParameters(
-       traffic_annotation_(traffic_annotation),
-       download_source_(DownloadSource::UNKNOWN),
-       require_safety_checks_(true),
-      has_user_gesture_(false) {}
-+      has_user_gesture_(false),
-+      update_first_party_url_on_redirect_(true) {}
- 
- DownloadUrlParameters::~DownloadUrlParameters() = default;
- 
-diff --git a/components/download/public/common/download_url_parameters.h b/components/download/public/common/download_url_parameters.h
-index ba0a03cb035a79651967ac2882f89f577bd0c012..61eb9af8a00c3e4adf700178994a9e6e864bcf0c 100644
--- a/components/download/public/common/download_url_parameters.h
-+++ b/components/download/public/common/download_url_parameters.h
-@@ -279,6 +279,11 @@ class COMPONENTS_DOWNLOAD_EXPORT DownloadUrlParameters {
-     has_user_gesture_ = has_user_gesture;
-   }
- 
-+  void set_update_first_party_url_on_redirect(
-+      bool update_first_party_url_on_redirect) {
-+    update_first_party_url_on_redirect_ = update_first_party_url_on_redirect;
-+  }
-+
-   OnStartedCallback& callback() { return callback_; }
-   bool content_initiated() const { return content_initiated_; }
-   const std::string& last_modified() const { return last_modified_; }
-@@ -335,6 +340,9 @@ class COMPONENTS_DOWNLOAD_EXPORT DownloadUrlParameters {
-     return isolation_info_;
-   }
-   bool has_user_gesture() const { return has_user_gesture_; }
-+  bool update_first_party_url_on_redirect() const {
-+    return update_first_party_url_on_redirect_;
-+  }
- 
-   // STATE CHANGING: All save_info_ sub-objects will be in an indeterminate
-   // state following this call.
-@@ -383,6 +391,7 @@ class COMPONENTS_DOWNLOAD_EXPORT DownloadUrlParameters {
-   bool require_safety_checks_;
-   absl::optional<net::IsolationInfo> isolation_info_;
-   bool has_user_gesture_;
-+  bool update_first_party_url_on_redirect_;
- };
- 
- }  // namespace download
-diff --git a/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc
-index 6dcc861171b7034d7426c5c683cafca689e3d7ea..500521ce2c383d40c13a9359ba4c49d3417670f7 100644
--- a/content/browser/download/download_browsertest.cc
-+++ b/content/browser/download/download_browsertest.cc
-@@ -3763,6 +3763,58 @@ IN_PROC_BROWSER_TEST_F(DownloadContentTest, UpdateSiteForCookies) {
-                                 site_a.GetURL("a.test", "/")));
- }
- 
-+// Tests that if `update_first_party_url_on_redirect` is set to false, download
-+// will not behave like a top-level frame navigation and SameSite=Strict cookies
-+// will not be set on a redirection.
-+IN_PROC_BROWSER_TEST_F(
-+    DownloadContentTest,
-+    SiteForCookies_DownloadUrl_NotUpdateFirstPartyUrlOnRedirect) {
-+  net::EmbeddedTestServer site_a;
-+  net::EmbeddedTestServer site_b;
-+
-+  base::StringPairs cookie_headers;
-+  cookie_headers.push_back(std::make_pair(
-+      std::string("Set-Cookie"), std::string("A=strict; SameSite=Strict")));
-+  cookie_headers.push_back(std::make_pair(std::string("Set-Cookie"),
-+                                          std::string("B=lax; SameSite=Lax")));
-+
-+  // This will request a URL on b.test, which redirects to a url that sets the
-+  // cookies on a.test.
-+  site_a.RegisterRequestHandler(CreateBasicResponseHandler(
-+      "/sets-samesite-cookies", net::HTTP_OK, cookie_headers,
-+      "application/octet-stream", "abcd"));
-+  ASSERT_TRUE(site_a.Start());
-+  site_b.RegisterRequestHandler(
-+      CreateRedirectHandler("/redirected-download",
-+                            site_a.GetURL("a.test", "/sets-samesite-cookies")));
-+  ASSERT_TRUE(site_b.Start());
-+
-+  // Download the file.
-+  SetupEnsureNoPendingDownloads();
-+  std::unique_ptr<download::DownloadUrlParameters> download_parameters(
-+      DownloadRequestUtils::CreateDownloadForWebContentsMainFrame(
-+          shell()->web_contents(),
-+          site_b.GetURL("b.test", "/redirected-download"),
-+          TRAFFIC_ANNOTATION_FOR_TESTS));
-+  download_parameters->set_update_first_party_url_on_redirect(false);
-+  std::unique_ptr<DownloadTestObserver> observer(CreateWaiter(shell(), 1));
-+  DownloadManagerForShell(shell())->DownloadUrl(std::move(download_parameters));
-+  observer->WaitForFinished();
-+
-+  // Get the important info from other threads and check it.
-+  EXPECT_TRUE(EnsureNoPendingDownloads());
-+
-+  std::vector<download::DownloadItem*> downloads;
-+  DownloadManagerForShell(shell())->GetAllDownloads(&downloads);
-+  ASSERT_EQ(1u, downloads.size());
-+  ASSERT_EQ(download::DownloadItem::COMPLETE, downloads[0]->GetState());
-+
-+  // Check that the cookies were not set on a.test.
-+  EXPECT_EQ("",
-+            content::GetCookies(shell()->web_contents()->GetBrowserContext(),
-+                                site_a.GetURL("a.test", "/")));
-+}
-+
- // Verifies that isolation info set in DownloadUrlParameters can be populated.
- IN_PROC_BROWSER_TEST_F(DownloadContentTest,
-                        SiteForCookies_DownloadUrl_IsolationInfoPopulated) {
--- a/patches/chromium/cherry-pick-c643d18a078d.patch
+++ b/patches/chromium/cherry-pick-c643d18a078d.patch
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Rayan Kanso <rayankans@google.com>
-Date: Tue, 7 Jun 2022 13:13:36 +0000
-Subject: Don't expose URL chain in case of CO redirect
-
-Bug: 1278255
-Change-Id: If853327b853e29792e5c8d1dfaeecf21d6fec004
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3693143
-Reviewed-by: Susanne Westphal <swestphal@google.com>
-Commit-Queue: Rayan Kanso <rayankans@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1011409}
-
-diff --git a/content/browser/background_fetch/storage/mark_request_complete_task.cc b/content/browser/background_fetch/storage/mark_request_complete_task.cc
-index 32a818ba8723f020fa536eb93a31c16b76ed92a1..d729dfc5d505c4c23872ef535a8b09f1af065914 100644
--- a/content/browser/background_fetch/storage/mark_request_complete_task.cc
-+++ b/content/browser/background_fetch/storage/mark_request_complete_task.cc
-@@ -104,6 +104,8 @@ void MarkRequestCompleteTask::StoreResponse(base::OnceClosure done_closure) {
-   BackgroundFetchCrossOriginFilter filter(
-       registration_id_.storage_key().origin(), *request_info_);
-   if (!filter.CanPopulateBody()) {
-+    // Don't expose the initial URL in case of cross-origin redirects.
-+    response_->url_list.resize(1);
-     failure_reason_ = proto::BackgroundFetchRegistration::FETCH_ERROR;
-     // No point writing the response to the cache since it won't be exposed.
-     CreateAndStoreCompletedRequest(std::move(done_closure));
--- a/patches/chromium/chore_add_electron_deps_to_gitignores.patch
+++ b/patches/chromium/chore_add_electron_deps_to_gitignores.patch
@@ -6,10 +6,10 @@ Subject: chore: add electron deps to gitignores
 Makes things like "git status" quicker when developing electron locally

 diff --git a/.gitignore b/.gitignore
-index cc0150c39bf635fa09d3efe9bfea2997b0b8263a..cdca4c4a9cccb7de0b13c8b803d6c74ba4d63d3a 100644
+index b58c0d6e0a610837436ba0f45d31738edcc46a4f..5dc9f119a0a5b8dd64373ccf1bf2b2b752be8c0f 100644
 --- a/.gitignore
 +++ b/.gitignore
-@@ -224,6 +224,7 @@ vs-chromium-project.txt
+@@ -229,6 +229,7 @@ vs-chromium-project.txt
 /delegate_execute
 /device/serial/device_serial_mojo.xml
 /docs/website
@@ -18,7 +18,7 @@ index cc0150c39bf635fa09d3efe9bfea2997b0b8263a..cdca4c4a9cccb7de0b13c8b803d6c74b
 /google_apis/internal
 /googleurl
 diff --git a/third_party/.gitignore b/third_party/.gitignore
-index 567e1de3c31b2275e07b897c2644c91aef9ca076..a6744fa9d31781c6ee866ba6291588caf44e8559 100644
+index 4d334479b45b93a182e9b92d889193726bb8e996..14663fdd6b909cd8b7c0538ebf9b2e5c19c3b75c 100644
 --- a/third_party/.gitignore
 +++ b/third_party/.gitignore
@@ -83,6 +83,7 @@
@@ -29,7 +29,7 @@ index 567e1de3c31b2275e07b897c2644c91aef9ca076..a6744fa9d31781c6ee866ba6291588ca
 /elfutils/src
 /emoji-segmenter/src
 /emoji-metadata/src
-@@ -177,6 +178,7 @@
+@@ -178,6 +179,7 @@
 /mocha
 /mockito/src
 /nacl_sdk_binaries/
@@ -37,7 +37,7 @@ index 567e1de3c31b2275e07b897c2644c91aef9ca076..a6744fa9d31781c6ee866ba6291588ca
 /nasm
 /nearby/src
 /neon_2_sse/src
-@@ -239,6 +241,7 @@
+@@ -241,6 +243,7 @@
 /speex
 /sqlite/src
 /sqlite4java/lib/
--- a/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
+++ b/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
@@ -7,7 +7,7 @@ With WCO, allow chromium to handle synthetic mouse events generated for touch
 actions in the non-client caption area.

 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 9fd052c00a484cd1acd2031fda79e6307fd01b60..016dfe880a48168154c08839afa540880c2d52be 100644
+index f6b37bdec2343d45447b419aeadbe2aa19493c3c..bdbf7153f27376bd68459f9cb480bff7485c9e98 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
@@ -1169,6 +1169,10 @@ void DesktopWindowTreeHostWin::HandleWindowScaleFactorChanged(
@@ -22,10 +22,10 @@ index 9fd052c00a484cd1acd2031fda79e6307fd01b60..016dfe880a48168154c08839afa54088
 DesktopWindowTreeHostWin::GetSingletonDesktopNativeCursorManager() {
   return new DesktopNativeCursorManagerWin();
 diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
-index 444581249014a8ce301591f269dbb194f0520732..9377f26b081b717db6b50c13ce3795907cf2fcd2 100644
+index 0aae49ec83b88057434af5bbfb54b10e53469918..058e5dc978e76a71fa02dc9e275592f3c39befea 100644
 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
 +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
-@@ -262,6 +262,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
+@@ -263,6 +263,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
   void HandleWindowSizeChanging() override;
   void HandleWindowSizeUnchanged() override;
   void HandleWindowScaleFactorChanged(float window_scale_factor) override;
@@ -34,10 +34,10 @@ index 444581249014a8ce301591f269dbb194f0520732..9377f26b081b717db6b50c13ce379590
   Widget* GetWidget();
   const Widget* GetWidget() const;
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 01ff95be00b3911749f66a136b2b5a6c02156bd3..23e8794c0551c377269ebecd6684206fc7087553 100644
+index 7c7952755317a8069becfff58ca5ec89e2266ce4..6496933a9c84c337b6ba25276badf7728eeabdfb 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -3064,15 +3064,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
+@@ -3129,15 +3129,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
       SetMsgHandled(FALSE);
     // We must let Windows handle the caption buttons if it's drawing them, or
     // they won't work.
--- a/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
+++ b/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shelley Vohr <shelley.vohr@gmail.com>
-Date: Mon, 5 Oct 2020 13:43:59 -0700
-Subject: chore: expose v8 initialization isolate callbacks
-
-This commit is necessary in order to ensure consistent behavior from
-v8 Isolate callbacks in contexts which Node.js does not control. If
-we're running with contextIsolation enabled, we should be falling back
-to Blink's logic. This will be upstreamed in some form.
-
-diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-index 90d3a635eec331130b738d0839cc9fdfa60ce451..9eb900ff4449f277f8c5ab3ccc29b0aa725be356 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-@@ -448,8 +448,9 @@ CodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
-   return {true, std::move(stringified_source)};
- }
- 
-bool V8Initializer::WasmCodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
-                                                 v8::Local<v8::String> source) {
-+bool V8Initializer::WasmCodeGenerationCheckCallbackInMainThread(
-+    v8::Local<v8::Context> context,
-+    v8::Local<v8::String> source) {
-   if (ExecutionContext* execution_context = ToExecutionContext(context)) {
-     if (ContentSecurityPolicy* policy =
-             execution_context->GetContentSecurityPolicy()) {
-diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
-index 932c6aad3df51dd6790e55bf708703767843dc5e..6865fd33e62f766c5a162ded8627c332bf2ed173 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
-+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
-@@ -69,8 +69,8 @@ class CORE_EXPORT V8Initializer {
-   static void MessageHandlerInWorker(v8::Local<v8::Message>,
-                                      v8::Local<v8::Value>);
-   static bool WasmCodeGenerationCheckCallbackInMainThread(
-      v8::Local<v8::Context> context,
-      v8::Local<v8::String> source);
-+    v8::Local<v8::Context> context,
-+    v8::Local<v8::String> source);
- };
- 
- }  // namespace blink
--- 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..4d996e3821410b2325ef85499f8c307c
 
 #endif  // CHROME_BROWSER_ANDROID_DOCUMENT_DOCUMENT_WEB_CONTENTS_DELEGATE_H_
 diff --git a/chrome/browser/media/offscreen_tab.cc b/chrome/browser/media/offscreen_tab.cc
-index 27452df45433e4aeb7b9008f8e5b91dd4b5f50db..5c6f9936e6d3d2647d7efbc70efda8551c5516c7 100644
+index 3289268d3ddb3fbb625b8498c2f84370c37acdff..89920af3e44257b6091bb558537fe07d2bb2d899 100644
 --- a/chrome/browser/media/offscreen_tab.cc
 +++ b/chrome/browser/media/offscreen_tab.cc
@@ -285,8 +285,7 @@ bool OffscreenTab::IsWebContentsCreationOverridden(
@@ -63,10 +63,10 @@ index faa684c429e8cd5817c043db48dcbea33c6c8782..8b5991bc8279585cc0749f6816aa8a03
       content::RenderFrameHost* requesting_frame,
       const blink::mojom::FullscreenOptions& options) final;
 diff --git a/chrome/browser/ui/ash/ash_web_view_impl.cc b/chrome/browser/ui/ash/ash_web_view_impl.cc
-index 46e5ec4d834e9478db523a5a078218104c161a57..e584921a6d575740fc0331a8bac05904558efc15 100644
+index 268355f22577cf21926e209a9fcdb3f52314f2ac..80f998cdb10d9955e438ba5ef4599b35c448fae2 100644
 --- a/chrome/browser/ui/ash/ash_web_view_impl.cc
 +++ b/chrome/browser/ui/ash/ash_web_view_impl.cc
-@@ -83,10 +83,9 @@ bool AshWebViewImpl::IsWebContentsCreationOverridden(
+@@ -84,10 +84,9 @@ bool AshWebViewImpl::IsWebContentsCreationOverridden(
     content::SiteInstance* source_site_instance,
     content::mojom::WindowContainerType window_container_type,
     const GURL& opener_url,
@@ -94,7 +94,7 @@ index f0333177f885000fb22818ffa30a0c4ad520a161..03e82957f9d7bf009dcbf5fcd43718c9
       content::WebContents* source,
       const content::OpenURLParams& params) override;
 diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
-index 6688ba8ba2fb7d930773144cdbc43f1f6fa2b685..22015c7b9b50e1264551ce226757f90e29191d8f 100644
+index 1318d5e04d5448d2b357454c3ce4207264288760..3b0324c35d5b18ed2e29264aae860c4887cdd382 100644
 --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
 +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
@@ -71,8 +71,7 @@ class ChromeKeyboardContentsDelegate : public content::WebContentsDelegate,
@@ -108,10 +108,10 @@ index 6688ba8ba2fb7d930773144cdbc43f1f6fa2b685..22015c7b9b50e1264551ce226757f90e
   }
 
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index 7548e63c57dc8463cb59614122e32c574ae17437..a9e1c335e3fae4fa795059c9b28bd5d404184c2e 100644
+index 63d64acc7231821219a7bcd89ee02590637d4b79..007689d1cb803704dc91bd152351ccfc11bd55b7 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -1786,12 +1786,11 @@ bool Browser::IsWebContentsCreationOverridden(
+@@ -1801,12 +1801,11 @@ bool Browser::IsWebContentsCreationOverridden(
     content::SiteInstance* source_site_instance,
     content::mojom::WindowContainerType window_container_type,
     const GURL& opener_url,
@@ -127,10 +127,10 @@ index 7548e63c57dc8463cb59614122e32c574ae17437..a9e1c335e3fae4fa795059c9b28bd5d4
 
 WebContents* Browser::CreateCustomWebContents(
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index 5edda102ff59ccb30d2150a88e75e8fb65379fca..82aaa442bca9e7a5e57315ace0b1c62e40ec1d24 100644
+index 87859f4741386c967a0568273a2fd16ad26c4a96..8265417dcf7397b2eb37e997547d1e8cfd977509 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
-@@ -808,8 +808,7 @@ class Browser : public TabStripModelObserver,
+@@ -839,8 +839,7 @@ class Browser : public TabStripModelObserver,
       content::SiteInstance* source_site_instance,
       content::mojom::WindowContainerType window_container_type,
       const GURL& opener_url,
@@ -218,10 +218,10 @@ index 2930898b03d7b7ef86d13733cec3cbe84105c166..76625339f42a867c8b68840253e91648
   void SetContentsBounds(content::WebContents* source,
                          const gfx::Rect& bounds) override;
 diff --git a/components/offline_pages/content/background_loader/background_loader_contents.cc b/components/offline_pages/content/background_loader/background_loader_contents.cc
-index 2834e3ee5778185741779a473cf5157788a76cc5..64fcddc952065e574a84edd99e5b1b80febd3d26 100644
+index 186711550a45f4bf383cdceeabac9e1f46aeca89..df1ecec4bf56de72a6164644d3094557a7a52896 100644
 --- a/components/offline_pages/content/background_loader/background_loader_contents.cc
 +++ b/components/offline_pages/content/background_loader/background_loader_contents.cc
-@@ -81,8 +81,7 @@ bool BackgroundLoaderContents::IsWebContentsCreationOverridden(
+@@ -83,8 +83,7 @@ bool BackgroundLoaderContents::IsWebContentsCreationOverridden(
     content::SiteInstance* source_site_instance,
     content::mojom::WindowContainerType window_container_type,
     const GURL& opener_url,
@@ -246,10 +246,10 @@ index c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b7
   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 add5ba98f4409460b93aa2f8c49eb49a1f59470a..4b77c71375a7375e168c9bee93a73c3af6fe1252 100644
+index c4c6159fa9bb94b340a5fbc545e77ac696e8cc52..6ca8c2510a42b50651621831474da6aee783e4c0 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3895,8 +3895,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3886,8 +3886,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
 
   if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                        source_site_instance, params.window_container_type,
@@ -260,7 +260,7 @@ index add5ba98f4409460b93aa2f8c49eb49a1f59470a..4b77c71375a7375e168c9bee93a73c3a
         static_cast<WebContentsImpl*>(delegate_->CreateCustomWebContents(
             opener, source_site_instance, is_new_browsing_instance,
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index c01e06b08b1cca7a663e30476a551904ce9c6db8..9f50a8721560f734270308776f2f37ad49a8cb91 100644
+index 99e8449e9c515dd70ed88546a71f83ae139178fe..4f395474d3e0e1bf7a594fe3fa3e4cb53327aa69 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
@@ -134,8 +134,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden(
@@ -274,7 +274,7 @@ index c01e06b08b1cca7a663e30476a551904ce9c6db8..9f50a8721560f734270308776f2f37ad
 }
 
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index 2556c044b6e28501a5fac9b0040e623b8f35f497..4c6cd654551b2f5cfd59a5271a8d95a9e6862d3c 100644
+index 5a9cc64d6e0d9d01f5dc133c7fcab34101bc32db..166e506f1afbcb1a3a661479d489e71d8d8ff552 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
@@ -317,8 +317,7 @@ class CONTENT_EXPORT WebContentsDelegate {
@@ -288,7 +288,7 @@ index 2556c044b6e28501a5fac9b0040e623b8f35f497..4c6cd654551b2f5cfd59a5271a8d95a9
   // 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 bddbd37ca73369adb82dad5bb8b25f0ab2a7f878..9bf28cd7f926f41041f40d4bc0a497c8b8730b86 100644
+index 8349c8cb2078d09c9550024ae5ca845bdebfbd35..e3763eaa2c6f7ce842cf8964bf5590efd3892c61 100644
 --- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc
 +++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
@@ -213,8 +213,7 @@ bool ExtensionOptionsGuest::IsWebContentsCreationOverridden(
@@ -316,7 +316,7 @@ index 7350382146178f58960a9bf68cd959076d2d9790..a70a94d14bdfa993feab60b8e4f32e10
       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 b652f1f30ce7043a0c8434d05a3b1da653aee1fc..259c62c60f302abebf167709b4a1c68ad5607129 100644
+index aef9d1a79fcea0e73541cf8257b498e167c9dfeb..1f0c4209d1c6be31e1abd6bcfcaf181fd2d4858c 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
@@ -402,8 +402,7 @@ bool MimeHandlerViewGuest::IsWebContentsCreationOverridden(
@@ -343,11 +343,11 @@ index ef6faf317dd4168adf6fd530a7da0b80f9166dec..f401659a81d4aeaf71039d71eb8fec48
   content::WebContents* CreateCustomWebContents(
       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 424c5f89440dccc29f3431e034d0a4fd4f647a00..8d40d0bd30fc28e841eedb3f34be3c033db62449 100644
--- a/fuchsia/engine/browser/frame_impl.cc
-+++ b/fuchsia/engine/browser/frame_impl.cc
-@@ -402,8 +402,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
+diff --git a/fuchsia_web/webengine/browser/frame_impl.cc b/fuchsia_web/webengine/browser/frame_impl.cc
+index bb3db273afbf25b8833df3483da8e8a808a0f42d..8f673a548fb537d138ccfc66e6cdcafd56110841 100644
+--- a/fuchsia_web/webengine/browser/frame_impl.cc
+++ b/fuchsia_web/webengine/browser/frame_impl.cc
+@@ -412,8 +412,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
     content::SiteInstance* source_site_instance,
     content::mojom::WindowContainerType window_container_type,
     const GURL& opener_url,
@@ -357,11 +357,11 @@ index 424c5f89440dccc29f3431e034d0a4fd4f647a00..8d40d0bd30fc28e841eedb3f34be3c03
   // Specify a generous upper bound for unacknowledged popup windows, so that we
   // 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 f2054bca778784c223beb02de150cfeb31c52907..53bf6bc205e9c631597bfbda46f4a0b5b4bb72ed 100644
--- a/fuchsia/engine/browser/frame_impl.h
-+++ b/fuchsia/engine/browser/frame_impl.h
-@@ -307,8 +307,7 @@ class FrameImpl : public fuchsia::web::Frame,
+diff --git a/fuchsia_web/webengine/browser/frame_impl.h b/fuchsia_web/webengine/browser/frame_impl.h
+index 0661fd642dcee69a7c8f955490dadf32dc0eb468..e3fa74da87513fbfcd035fa872dc938db96c2766 100644
+--- a/fuchsia_web/webengine/browser/frame_impl.h
+++ b/fuchsia_web/webengine/browser/frame_impl.h
+@@ -310,8 +310,7 @@ class WEB_ENGINE_EXPORT FrameImpl : public fuchsia::web::Frame,
       content::SiteInstance* source_site_instance,
       content::mojom::WindowContainerType window_container_type,
       const GURL& opener_url,
@@ -372,7 +372,7 @@ index f2054bca778784c223beb02de150cfeb31c52907..53bf6bc205e9c631597bfbda46f4a0b5
                           int opener_render_process_id,
                           int opener_render_frame_id,
 diff --git a/headless/lib/browser/headless_web_contents_impl.cc b/headless/lib/browser/headless_web_contents_impl.cc
-index 899b8beabdf1131a08583470ace5b468576eeab6..21ab4ae22c54846af78518e897dc23ebe4ce8317 100644
+index 9108af112833f022f82d2645193eb99326633292..882cd523b2ff8b2e51ad5b23a7ba967d473217fc 100644
 --- a/headless/lib/browser/headless_web_contents_impl.cc
 +++ b/headless/lib/browser/headless_web_contents_impl.cc
@@ -177,8 +177,7 @@ class HeadlessWebContentsImpl::Delegate : public content::WebContentsDelegate {
@@ -386,7 +386,7 @@ index 899b8beabdf1131a08583470ace5b468576eeab6..21ab4ae22c54846af78518e897dc23eb
         ->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 749200efec166e0c29402a3d5e079f2e94460363..2cbc96e911291fb0b31c3f4a1444ded0be4521f5 100644
+index fb5239100bdc35d2d5cf47765c1bf1b285b20cf5..b4b2609ddbe0a0adfccffb4f4a0a56849579dd2d 100644
 --- a/ui/views/controls/webview/web_dialog_view.cc
 +++ b/ui/views/controls/webview/web_dialog_view.cc
@@ -427,8 +427,7 @@ bool WebDialogView::IsWebContentsCreationOverridden(
--- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
+++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Attard <sattard@slack-corp.com>
-Date: Wed, 23 Oct 2019 14:17:18 -0700
-Subject: chore: use electron resources not chrome for spellchecker
-
-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 af2fd82cbc458b396107a161d9c3dd31077e57a7..948d05358b89895faa97a7d383bfac66a45464a8 100644
--- a/chrome/browser/BUILD.gn
-+++ b/chrome/browser/BUILD.gn
-@@ -7182,6 +7182,7 @@ static_library("browser") {
-     deps += [
-       "//components/spellcheck/browser",
-       "//components/spellcheck/common",
-+      "//electron:resources",
-     ]
- 
-     if (!is_android) {
-diff --git a/chrome/browser/spellchecker/spellcheck_factory.cc b/chrome/browser/spellchecker/spellcheck_factory.cc
-index 7c3b6a69acb16186add5d467dbc22360d90d46d4..703e2ce60f4f35f9c71e8b503ffd62f9ea8f365a 100644
--- a/chrome/browser/spellchecker/spellcheck_factory.cc
-+++ b/chrome/browser/spellchecker/spellcheck_factory.cc
-@@ -7,7 +7,7 @@
- #include "build/build_config.h"
- #include "chrome/browser/profiles/incognito_helpers.h"
- #include "chrome/browser/spellchecker/spellcheck_service.h"
-#include "chrome/grit/locale_settings.h"
-+#include "electron/grit/electron_resources.h"
- #include "components/keyed_service/content/browser_context_dependency_manager.h"
- #include "components/pref_registry/pref_registry_syncable.h"
- #include "components/prefs/pref_service.h"
-diff --git a/components/language/core/browser/BUILD.gn b/components/language/core/browser/BUILD.gn
-index fdba4ca90882656d6ba369dae48d5dfc13991cb8..fb3b759362275aafd4ed01a7865a4dd0dfaad727 100644
--- a/components/language/core/browser/BUILD.gn
-+++ b/components/language/core/browser/BUILD.gn
-@@ -30,6 +30,7 @@ static_library("browser") {
-     "//components/pref_registry",
-     "//components/prefs",
-     "//components/strings",
-+    "//electron:resources",
-     "//ui/base",
-   ]
- }
-diff --git a/components/language/core/browser/language_prefs.cc b/components/language/core/browser/language_prefs.cc
-index 26f86d67c32b2a022698ae5ea5509912d2ccfacb..d48844d49308d67ee7bfa823335c7443173badbe 100644
--- a/components/language/core/browser/language_prefs.cc
-+++ b/components/language/core/browser/language_prefs.cc
-@@ -22,7 +22,7 @@
- #include "components/pref_registry/pref_registry_syncable.h"
- #include "components/prefs/pref_service.h"
- #include "components/prefs/scoped_user_pref_update.h"
-#include "components/strings/grit/components_locale_settings.h"
-+#include "electron/grit/electron_resources.h"
- #include "ui/base/l10n/l10n_util.h"
- 
- namespace language {
--- a/patches/chromium/chrome_key_systems.patch
+++ b/patches/chromium/chrome_key_systems.patch
@@ -7,7 +7,7 @@ Disable persiste licence support check for widevine cdm,
 as its not supported in the current version of chrome.

 diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
-index ff769b9855810bfe3761079ddae286fc8aa5602f..1fea025e8fc1d4e2496f117780fa4d0eb2f2e983 100644
+index f3cf8498493526d125eb42a7c42f7ad85dbc1fc2..35ec5dc4d87ecc61bd0f48be4c5d5867e9f75cce 100644
 --- a/chrome/renderer/media/chrome_key_systems.cc
 +++ b/chrome/renderer/media/chrome_key_systems.cc
@@ -17,7 +17,9 @@
@@ -20,18 +20,18 @@ index ff769b9855810bfe3761079ddae286fc8aa5602f..1fea025e8fc1d4e2496f117780fa4d0e
 #include "components/cdm/renderer/external_clear_key_key_system_properties.h"
 #include "components/cdm/renderer/widevine_key_system_properties.h"
 #include "content/public/renderer/render_thread.h"
-@@ -183,12 +185,14 @@ SupportedCodecs GetSupportedCodecs(const media::CdmCapability& capability) {
+@@ -184,12 +186,14 @@ SupportedCodecs GetSupportedCodecs(const media::CdmCapability& capability) {
 
- // Returns persistent-license session support.
- EmeSessionTypeSupport GetPersistentLicenseSupport(bool supported_by_the_cdm) {
+ // Returns whether persistent-license session can be supported.
+ bool CanSupportPersistentLicense() {
 +#if 0
   // Do not support persistent-license if the process cannot persist data.
   // TODO(crbug.com/457487): Have a better plan on this. See bug for details.
   if (ChromeRenderThreadObserver::is_incognito_process()) {
     DVLOG(2) << __func__ << ": Not supported in incognito process.";
-     return EmeSessionTypeSupport::NOT_SUPPORTED;
+     return false;
   }
 +#endif
 
-   if (!supported_by_the_cdm) {
-     DVLOG(2) << __func__ << ": Not supported by the CDM.";
+ // On ChromeOS, platform verification is similar to CDM host verification.
+ #if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) || BUILDFLAG(IS_CHROMEOS)
--- a/patches/chromium/command-ismediakey.patch
+++ b/patches/chromium/command-ismediakey.patch
@@ -66,7 +66,7 @@ index eb3f3431a3774c3a05afd4c7350f3801e9c8c684..b8970ef9ddb69d6a9fc6d106293e7605
 
   bool is_listening_ = false;
 diff --git a/chrome/browser/extensions/global_shortcut_listener_win.cc b/chrome/browser/extensions/global_shortcut_listener_win.cc
-index 0f344ee352a48497e77a72bb298146c61e7fcf2a..3bad4263ea552fc63445bf5613f8add746a3a374 100644
+index 2778a18b6c28f3342c6b43d1de71fbbd46c72f06..85af551f87b8b0f9aed7a2a395ecf79f81f5a0a1 100644
 --- a/chrome/browser/extensions/global_shortcut_listener_win.cc
 +++ b/chrome/browser/extensions/global_shortcut_listener_win.cc
@@ -62,6 +62,8 @@ void GlobalShortcutListenerWin::OnWndProc(HWND hwnd,
@@ -117,7 +117,7 @@ index 1145e1f3d79482b5bb468c3128431ac674310e5f..e9f595045e0c076e0735f27dfc38bfbc
 
 }  // namespace ui
 diff --git a/ui/base/accelerators/media_keys_listener_mac.mm b/ui/base/accelerators/media_keys_listener_mac.mm
-index ada705fb42e88d4bfa05b212c84111be9057a50e..a866b975687dd08ad88031a63f161b3164e82455 100644
+index 0bed8d1e2e2ed4a8cfc9d51ec3d68ac75bd9ff82..6914758849ca485f0f882d0b4a9ded9b02b197a8 100644
 --- a/ui/base/accelerators/media_keys_listener_mac.mm
 +++ b/ui/base/accelerators/media_keys_listener_mac.mm
@@ -32,6 +32,12 @@ KeyboardCode MediaKeyCodeToKeyboardCode(int key_code) {
--- a/patches/chromium/crash_allow_disabling_compression_on_linux.patch
+++ b/patches/chromium/crash_allow_disabling_compression_on_linux.patch
@@ -13,10 +13,10 @@ Ultimately we should remove the option to disable compression, and
 subsequently remove this patch.

 diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
-index 8df14f416ee321e1259433715a61fa6025207d80..1d7f38d3f89d9c7f110cc9eb880264464787eb32 100644
+index a372e9bb12f9cec6235fe529d73b6e0009328038..58f6f559265d0da5e6ca4c711df4b1dbf3d40e38 100644
 --- a/components/crash/core/app/breakpad_linux.cc
 +++ b/components/crash/core/app/breakpad_linux.cc
-@@ -110,6 +110,8 @@ void SetUploadURL(const std::string& url) {
+@@ -111,6 +111,8 @@ void SetUploadURL(const std::string& url) {
   DCHECK(!g_upload_url);
   g_upload_url = strdup(url.c_str());
 }
@@ -25,9 +25,9 @@ index 8df14f416ee321e1259433715a61fa6025207d80..1d7f38d3f89d9c7f110cc9eb88026446
 #endif
 
 bool g_is_node = false;
-@@ -1322,56 +1324,60 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
+@@ -1324,56 +1326,60 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
 
- #else   // BUILDFLAG(IS_CHROMEOS_ASH)
+ #else   // BUILDFLAG(IS_CHROMEOS)
 
 -  // Compress |dumpfile| with gzip.
 -  const pid_t gzip_child = sys_fork();
@@ -127,7 +127,7 @@ index 8df14f416ee321e1259433715a61fa6025207d80..1d7f38d3f89d9c7f110cc9eb88026446
   static const char header_msg[] =
       "--header=Content-Type: multipart/form-data; boundary=";
   const size_t header_content_type_size =
-@@ -1398,7 +1404,8 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
+@@ -1400,7 +1406,8 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
   static const char kWgetBinary[] = "/usr/bin/wget";
   const char* args[] = {
       kWgetBinary,
@@ -137,9 +137,9 @@ index 8df14f416ee321e1259433715a61fa6025207d80..1d7f38d3f89d9c7f110cc9eb88026446
       header_content_type,
       post_file,
       g_upload_url,
-@@ -2039,6 +2046,7 @@ void InitCrashReporter(const std::string& process_type) {
+@@ -2041,6 +2048,7 @@ void InitCrashReporter(const std::string& process_type) {
 
- #if !BUILDFLAG(IS_CHROMEOS_ASH)
+ #if !BUILDFLAG(IS_CHROMEOS)
   SetUploadURL(GetCrashReporterClient()->GetUploadUrl());
 +  g_compress_uploads = GetCrashReporterClient()->GetShouldCompressUploads();
 #endif
--- a/patches/chromium/crash_allow_setting_more_options.patch
+++ b/patches/chromium/crash_allow_setting_more_options.patch
@@ -9,10 +9,10 @@ rate-limiting, compression and global annotations.
 This should be upstreamed.

 diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
-index 823e49a234e3dd31bf6527c2e4efa96f3d23f1f2..43f6d476f3ee2759cf41c492f932522994e7ddec 100644
+index 3c28019ae3d1d8fd43e5e027fa3abe6786658885..b1f8fd4494e7f5deac078023c2e0240d701e1f13 100644
 --- a/components/crash/core/app/breakpad_linux.cc
 +++ b/components/crash/core/app/breakpad_linux.cc
-@@ -112,6 +112,7 @@ void SetUploadURL(const std::string& url) {
+@@ -113,6 +113,7 @@ void SetUploadURL(const std::string& url) {
 }
 #endif
 
@@ -75,7 +75,7 @@ index 24e53fa62c2c4a11494ad3d43f0c5a806930fcdd..9b691baa6cc90cc3f9ada307c43f44c4
   // Used by WebView to sample crashes without generating the unwanted dumps. If
   // the returned value is less than 100, crash dumping will be sampled to that
 diff --git a/components/crash/core/app/crashpad_linux.cc b/components/crash/core/app/crashpad_linux.cc
-index 32e2038e15adae14aa218a353f074cd6654bdc16..72bec9c08d7ec50257a86b0ee7173864d879d7d9 100644
+index 39fb479eba509f7ba1528cafecd1c6b21f3b0e76..a28b88d078560f05fa295f29dcf8b1865839285c 100644
 --- a/components/crash/core/app/crashpad_linux.cc
 +++ b/components/crash/core/app/crashpad_linux.cc
@@ -170,6 +170,7 @@ bool PlatformCrashpadInitialization(
@@ -128,10 +128,10 @@ index dc041c43371fd58e3121ef6bc423aadb644bb8d0..a1fa566775724b4a1662a939fda3f0a5
         arguments.push_back("--monitor-self");
       }
 diff --git a/components/crash/core/app/crashpad_win.cc b/components/crash/core/app/crashpad_win.cc
-index d2354b84f3a184ad53571518198055a0a91cbc25..c05529257dda2acf0fa588d49e2b902736d9b02f 100644
+index 80f33dc5e2f2ed330e0726a5735b247ea8e99fd7..b96bf703f6b691886d6e4d5cd6d775945a8995e1 100644
 --- a/components/crash/core/app/crashpad_win.cc
 +++ b/components/crash/core/app/crashpad_win.cc
-@@ -88,6 +88,7 @@ bool PlatformCrashpadInitialization(
+@@ -90,6 +90,7 @@ bool PlatformCrashpadInitialization(
 
     std::map<std::string, std::string> process_annotations;
     GetPlatformCrashpadAnnotations(&process_annotations);
@@ -139,7 +139,7 @@ index d2354b84f3a184ad53571518198055a0a91cbc25..c05529257dda2acf0fa588d49e2b9027
 
     std::string url = crash_reporter_client->GetUploadUrl();
 
-@@ -126,6 +127,13 @@ bool PlatformCrashpadInitialization(
+@@ -128,6 +129,13 @@ bool PlatformCrashpadInitialization(
 
     std::vector<std::string> arguments(start_arguments);
 
--- a/patches/chromium/custom_protocols_plzserviceworker.patch
+++ b/patches/chromium/custom_protocols_plzserviceworker.patch
@@ -8,10 +8,10 @@ Allow registering custom protocols to handle service worker main script fetching
 Refs https://bugs.chromium.org/p/chromium/issues/detail?id=996511

 diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc
-index f827745b9800d4f11a17e405b0eb22601d7e4dd4..0cecbfb2a6fd3daa71338c94bda4b1f45eb51d5e 100644
+index 654219d75727c189d377cf14e25a8abdc1002204..3e243964f429c3afcb874b208c672991dd3468bf 100644
 --- a/content/browser/service_worker/service_worker_context_wrapper.cc
 +++ b/content/browser/service_worker/service_worker_context_wrapper.cc
-@@ -1591,6 +1591,28 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
+@@ -1649,6 +1649,28 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
       loader_factory_bundle_info =
           context()->loader_factory_bundle_for_update_check()->Clone();
 
@@ -40,7 +40,7 @@ index f827745b9800d4f11a17e405b0eb22601d7e4dd4..0cecbfb2a6fd3daa71338c94bda4b1f4
   if (base::FeatureList::IsEnabled(
           features::kEnableServiceWorkersForChromeUntrusted) &&
       scope.scheme_piece() == kChromeUIUntrustedScheme) {
-@@ -1611,9 +1633,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
+@@ -1669,9 +1691,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
             browser_context(), scope_origin)) {
       config->RegisterURLDataSource(browser_context());
 
--- 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/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
-index ab0afb79514e42acb87e94809ed4a2b7c736a825..23fb303820860a030643d6d5a1a449823bb146e8 100644
+index 21e7b1cbada3856a7d91040c259be80ae95df07e..b19206ba58725f949403469a3e1d221b12833581 100644
 --- a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
 +++ b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
-@@ -515,8 +515,7 @@ void MobileFriendlinessChecker::NotifyInvalidatePaint(
+@@ -542,8 +542,7 @@ void MobileFriendlinessChecker::NotifyInvalidatePaint(
                                ->GetPageScaleConstraintsSet()
                                .FinalConstraints()
                                .initial_scale;
--- a/patches/chromium/desktop_media_list.patch
+++ b/patches/chromium/desktop_media_list.patch
@@ -82,19 +82,10 @@ index 1e4a652634fbde2ca9a256baca840bbc5a0e001f..546f5bc3a2f79035f0eec196d9e704b8
   const Source& GetSource(int index) const override;
   DesktopMediaList::Type GetMediaListType() const override;
 diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-index 6d8c9d940bb4488ffedc1eb8c543c065bb3953c9..2026b926eee56f6b235963b23ab86b2743eaed90 100644
+index d2297c082f482219f35c3acf5bcc8dadf18bbafb..97b1589793962b2b601a78ef5118256903ee65f9 100644
 --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
 +++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-@@ -18,7 +18,7 @@
- #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
- #include "chrome/browser/media/webrtc/desktop_media_list.h"
-#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "content/public/browser/browser_task_traits.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/common/content_features.h"
-@@ -127,8 +127,9 @@ BOOL CALLBACK AllHwndCollector(HWND hwnd, LPARAM param) {
+@@ -139,8 +139,9 @@ BOOL CALLBACK AllHwndCollector(HWND hwnd, LPARAM param) {
 #endif  // BUILDFLAG(IS_WIN)
 
 #if BUILDFLAG(IS_MAC)
@@ -105,7 +96,7 @@ index 6d8c9d940bb4488ffedc1eb8c543c065bb3953c9..2026b926eee56f6b235963b23ab86b27
 #endif
 
 }  // namespace
-@@ -415,6 +416,9 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
+@@ -427,6 +428,9 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
       FROM_HERE,
       base::BindOnce(&NativeDesktopMediaList::UpdateNativeThumbnailsFinished,
                      media_list_));
@@ -115,7 +106,7 @@ index 6d8c9d940bb4488ffedc1eb8c543c065bb3953c9..2026b926eee56f6b235963b23ab86b27
 }
 
 void NativeDesktopMediaList::Worker::OnCaptureResult(
-@@ -628,6 +632,11 @@ void NativeDesktopMediaList::RefreshForVizFrameSinkWindows(
+@@ -642,6 +646,11 @@ void NativeDesktopMediaList::RefreshForVizFrameSinkWindows(
         FROM_HERE, base::BindOnce(&Worker::RefreshThumbnails,
                                   base::Unretained(worker_.get()),
                                   std::move(native_ids), thumbnail_size_));
--- 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 2b69f4767e9073ea5f12acddf842c7f1dc82e2c1..a2f053c3e2588451458682aa6e86da52a591e1e7 100644
+index 2d21f2e408004fbaf6a19980ad5daf47493aec65..c6a0ac1c5dd98a41392bd170bb0ada7418f17453 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
@@ -308,6 +308,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
@@ -29,15 +29,17 @@ index 2b69f4767e9073ea5f12acddf842c7f1dc82e2c1..a2f053c3e2588451458682aa6e86da52
 // A scoping class that prevents a window from being able to redraw in response
 // to invalidations that may occur within it for the lifetime of the object.
 //
-@@ -359,6 +363,7 @@ class HWNDMessageHandler::ScopedRedrawLock {
+@@ -358,7 +362,8 @@ class HWNDMessageHandler::ScopedRedrawLock {
+         hwnd_(owner_->hwnd()),
         cancel_unlock_(false),
         should_lock_(owner_->IsVisible() && !owner->HasChildRenderingWindow() &&
-                      ::IsWindow(hwnd_) &&
-+                     !owner_->HasNativeFrame() &&
+-                     ::IsWindow(hwnd_) && !owner_->IsHeadless() &&
+                     ::IsWindow(hwnd_) && !owner_->HasNativeFrame() &&
+                     !owner_->IsHeadless() &&
                      (!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
                       !ui::win::IsAeroGlassEnabled())) {
     if (should_lock_)
-@@ -986,6 +991,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
+@@ -1051,6 +1056,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
   return scoped_enable;
 }
 
@@ -49,10 +51,10 @@ index 2b69f4767e9073ea5f12acddf842c7f1dc82e2c1..a2f053c3e2588451458682aa6e86da52
 // HWNDMessageHandler, gfx::WindowImpl overrides:
 
 diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
-index f4efdc7174b90e57fb332f031530545e493a2e0d..9d45f97b930831a703efab2bbdf10afb61140c7f 100644
+index 73337f6b14516f93500705606c89e4c7b5a55f35..6badb272496a630031592372c1a766a9d70bb26a 100644
 --- a/ui/views/win/hwnd_message_handler.h
 +++ b/ui/views/win/hwnd_message_handler.h
-@@ -205,6 +205,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
+@@ -207,6 +207,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
   using TouchIDs = std::set<DWORD>;
   enum class DwmFrameState { kOff, kOn };
 
--- a/patches/chromium/disable_color_correct_rendering.patch
+++ b/patches/chromium/disable_color_correct_rendering.patch
@@ -20,10 +20,10 @@ 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 14e13169de8b5e808e3284792237bef9939b1e00..67839f87fb0dcb2eed9bc001806020befbed5f66 100644
+index aca208728d0dae78e57bf4b7f0af46ed5ad73e68..2afef2fb0d3890bdada7d5785a4a48494d580cab 100644
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
-@@ -1894,6 +1894,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
+@@ -1852,6 +1852,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
 TargetColorParams LayerTreeHostImpl::GetTargetColorParams(
     gfx::ContentColorUsage content_color_usage) const {
   TargetColorParams params;
@@ -35,7 +35,7 @@ index 14e13169de8b5e808e3284792237bef9939b1e00..67839f87fb0dcb2eed9bc001806020be
   // If we are likely to software composite the resource, we use sRGB because
   // software compositing is unable to perform color conversion.
 diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
-index f6094a5defe12c34564020b0779626b3e5bff99e..a068a9ba33d3f8c8cdc74ae63ab5e16caa0b90c3 100644
+index 8dfe968b6314f5f5f350b3df6819043668293fd6..2f3a8a335d130c3be58b87bccdb95bd66ae37091 100644
 --- a/cc/trees/layer_tree_settings.h
 +++ b/cc/trees/layer_tree_settings.h
@@ -93,6 +93,8 @@ class CC_EXPORT LayerTreeSettings {
@@ -48,7 +48,7 @@ index f6094a5defe12c34564020b0779626b3e5bff99e..a068a9ba33d3f8c8cdc74ae63ab5e16c
   // Image Decode Service and raster tiles without images until the decode is
   // ready.
 diff --git a/components/viz/common/display/renderer_settings.h b/components/viz/common/display/renderer_settings.h
-index 8b0b5eda59c863efb6f4c67636810871677894c5..eea098eab3c2a5c36fab1a71d888e562e8f93da5 100644
+index bc48a50a7664f12a454997db54d893cde9b04881..810a8ce52bf9ac74f47a710f8b332980754996f5 100644
 --- a/components/viz/common/display/renderer_settings.h
 +++ b/components/viz/common/display/renderer_settings.h
@@ -24,6 +24,7 @@ class VIZ_COMMON_EXPORT RendererSettings {
@@ -60,7 +60,7 @@ index 8b0b5eda59c863efb6f4c67636810871677894c5..eea098eab3c2a5c36fab1a71d888e562
   bool force_antialiasing = false;
   bool force_blending_with_shaders = false;
 diff --git a/components/viz/host/renderer_settings_creation.cc b/components/viz/host/renderer_settings_creation.cc
-index 6a830ec9f29b9764cd425f0681dafbb18d90b457..a7a095ceb9e626c79db21e0d16c8ef47da860679 100644
+index 9d34ced366026eb7cdd00ce40a4eb1af56180d39..abf67f8246bfa37df08cd2216c388dd316fb6499 100644
 --- a/components/viz/host/renderer_settings_creation.cc
 +++ b/components/viz/host/renderer_settings_creation.cc
@@ -17,6 +17,7 @@
@@ -80,159 +80,11 @@ index 6a830ec9f29b9764cd425f0681dafbb18d90b457..a7a095ceb9e626c79db21e0d16c8ef47
   renderer_settings.partial_swap_enabled =
       !command_line->HasSwitch(switches::kUIDisablePartialSwap);
 
-diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
-index 7fb664525ba696626544c8b09597105bff874c05..b987d649ef84451a9d3e5c2f87da3eb06c19c4d6 100644
--- a/components/viz/service/display/gl_renderer.cc
-+++ b/components/viz/service/display/gl_renderer.cc
-@@ -87,6 +87,9 @@
- 
- using gpu::gles2::GLES2Interface;
- 
-+#define PATCH_CS(color_space) \
-+  (settings_->enable_color_correct_rendering ? color_space : gfx::ColorSpace())
-+
- namespace viz {
- namespace {
- 
-@@ -685,8 +688,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad,
- void GLRenderer::DrawDebugBorderQuad(const DebugBorderDrawQuad* quad) {
-   SetBlendEnabled(quad->ShouldDrawWithBlending());
- 
-  SetUseProgram(ProgramKey::DebugBorder(), gfx::ColorSpace::CreateSRGB(),
-                CurrentRenderPassColorSpace());
-+  SetUseProgram(ProgramKey::DebugBorder(),
-+                PATCH_CS(gfx::ColorSpace::CreateSRGB()),
-+                PATCH_CS(CurrentRenderPassColorSpace()));
- 
-   // Use the full quad_rect for debug quads to not move the edges based on
-   // partial swaps.
-@@ -1676,7 +1680,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
-           params->use_color_matrix, tint_gl_composited_content_,
-           params->apply_shader_based_rounded_corner &&
-               ShouldApplyRoundedCorner(params->quad)),
-      params->contents_and_bypass_color_space, target_color_space);
-+          PATCH_CS(params->contents_and_bypass_color_space),
-+          PATCH_CS(target_color_space));
- }
- 
- void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) {
-@@ -2149,7 +2154,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
-   SetUseProgram(ProgramKey::SolidColor(use_aa ? USE_AA : NO_AA,
-                                        tint_gl_composited_content_,
-                                        ShouldApplyRoundedCorner(quad)),
-                CurrentRenderPassColorSpace(), CurrentRenderPassColorSpace());
-+                PATCH_CS(CurrentRenderPassColorSpace()),
-+                PATCH_CS(CurrentRenderPassColorSpace()));
- 
-   gfx::ColorSpace quad_color_space = gfx::ColorSpace::CreateSRGB();
-   SkColor4f color_f = SkColor4f::FromColor(color);
-@@ -2157,7 +2163,7 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
-   // Apply color transform if the color space or source and target do not match.
-   if (quad_color_space != CurrentRenderPassColorSpace()) {
-     const gfx::ColorTransform* color_transform =
-        GetColorTransform(quad_color_space, CurrentRenderPassColorSpace());
-+        GetColorTransform(PATCH_CS(quad_color_space), PATCH_CS(CurrentRenderPassColorSpace()));
-     gfx::ColorTransform::TriStim col(color_f.fR, color_f.fG, color_f.fB);
-     color_transform->Transform(&col, 1);
-     color_f.fR = col.x();
-@@ -2379,7 +2385,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
-                                               : NON_PREMULTIPLIED_ALPHA,
-                        false, false, tint_gl_composited_content_,
-                        ShouldApplyRoundedCorner(quad)),
-      quad_resource_lock.color_space(), CurrentRenderPassColorSpace());
-+      PATCH_CS(quad_resource_lock.color_space()),
-+      PATCH_CS(CurrentRenderPassColorSpace()));
- 
-   if (current_program_->tint_color_matrix_location() != -1) {
-     auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
-@@ -2478,7 +2485,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
-                        !quad->ShouldDrawWithBlending(), has_tex_clamp_rect,
-                        tint_gl_composited_content_,
-                        ShouldApplyRoundedCorner(quad)),
-      quad_resource_lock.color_space(), CurrentRenderPassColorSpace());
-+      PATCH_CS(quad_resource_lock.color_space()),
-+      PATCH_CS(CurrentRenderPassColorSpace()));
- 
-   if (current_program_->tint_color_matrix_location() != -1) {
-     auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
-@@ -2588,7 +2596,8 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
-   // The source color space should never be RGB.
-   DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB());
- 
-  gfx::ColorSpace dst_color_space = CurrentRenderPassColorSpace();
-+  gfx::ColorSpace dst_color_space =
-+      PATCH_CS(CurrentRenderPassColorSpace());
- 
- #if BUILDFLAG(IS_WIN)
-   // Force sRGB output on Windows for overlay candidate video quads to match
-@@ -2769,7 +2778,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
- 
-   SetUseProgram(ProgramKey::VideoStream(tex_coord_precision,
-                                         ShouldApplyRoundedCorner(quad)),
-                lock.color_space(), CurrentRenderPassColorSpace());
-+                PATCH_CS(lock.color_space()),
-+                PATCH_CS(CurrentRenderPassColorSpace()));
- 
-   DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
-   gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id());
-@@ -2840,8 +2850,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
-       draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR);
- 
-   // Bind the program to the GL state.
-  SetUseProgram(draw_cache_.program_key, locked_quad.color_space(),
-                CurrentRenderPassColorSpace(),
-+  SetUseProgram(draw_cache_.program_key, PATCH_CS(locked_quad.color_space()),
-+                PATCH_CS(CurrentRenderPassColorSpace()),
-                 /*adjust_src_white_level=*/draw_cache_.is_video_frame,
-                 locked_quad.hdr_metadata());
- 
-@@ -3698,7 +3708,9 @@ void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
-                                const gfx::ColorSpace& dst_color_space,
-                                bool adjust_src_white_level,
-                                absl::optional<gfx::HDRMetadata> hdr_metadata) {
-  DCHECK(dst_color_space.IsValid());
-+  if (settings_->enable_color_correct_rendering) {
-+    DCHECK(dst_color_space.IsValid());
-+  }
-   gfx::ColorSpace adjusted_src_color_space = src_color_space;
-   if (adjust_src_white_level && src_color_space.IsHDR()) {
-     // TODO(b/183236148): consider using the destination's HDR static metadata
-@@ -4084,9 +4096,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
-         cc::MathUtil::CheckedRoundUp(iosurface_height, iosurface_multiple);
-   }
- 
-  *overlay_texture =
-      FindOrCreateOverlayTexture(params.quad->render_pass_id, iosurface_width,
-                                 iosurface_height, RootRenderPassColorSpace());
-+  *overlay_texture = FindOrCreateOverlayTexture(
-+      params.quad->render_pass_id, iosurface_width, iosurface_height,
-+      PATCH_CS(RootRenderPassColorSpace()));
-   *new_bounds = gfx::RectF(updated_dst_rect.origin(),
-                            gfx::SizeF((*overlay_texture)->texture.size()));
- 
-@@ -4305,8 +4317,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
- 
-   PrepareGeometry(SHARED_BINDING);
- 
-  SetUseProgram(ProgramKey::DebugBorder(), gfx::ColorSpace::CreateSRGB(),
-                CurrentRenderPassColorSpace());
-+  SetUseProgram(ProgramKey::DebugBorder(),
-+                PATCH_CS(gfx::ColorSpace::CreateSRGB()),
-+                PATCH_CS(CurrentRenderPassColorSpace()));
- 
-   gfx::Transform render_matrix;
-   render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(),
-@@ -4512,3 +4525,5 @@ bool GLRenderer::ColorTransformKey::operator<(
- }
- 
- }  // namespace viz
-+
-+#undef PATCH_CS
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index 8cd9a960ca1de81857af60daa91596c1dbb17786..7455afe4d81eac31fe3792a4459834a7f968918c 100644
+index 954aa49ed7cd6e47e56ffdfcd3b6218964862245..1a85566c28e91967603946e8941462e9ea704c68 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
-@@ -227,6 +227,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
+@@ -228,6 +228,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
 
 // Command-line switches to propagate to the GPU process.
 static const char* const kSwitchNames[] = {
@@ -241,10 +93,10 @@ index 8cd9a960ca1de81857af60daa91596c1dbb17786..7455afe4d81eac31fe3792a4459834a7
     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 09f72f1fbd7b782c5bf52245482b358103f0c243..80d9fd40efed1edc90e7bdf1db534acb876206ca 100644
+index 73a50b19f8bf75119b6af7698cdf7d569c504e77..9fdc3d5235a95cfc9ef3b94ba9c19630efb04cde 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -198,6 +198,7 @@
+@@ -199,6 +199,7 @@
 #include "ui/accessibility/accessibility_switches.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/display/display_switches.h"
@@ -252,7 +104,7 @@ index 09f72f1fbd7b782c5bf52245482b358103f0c243..80d9fd40efed1edc90e7bdf1db534acb
 #include "ui/gl/gl_switches.h"
 #include "url/gurl.h"
 #include "url/origin.h"
-@@ -3219,6 +3220,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3173,6 +3174,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[] = {
@@ -260,21 +112,8 @@ index 09f72f1fbd7b782c5bf52245482b358103f0c243..80d9fd40efed1edc90e7bdf1db534acb
     switches::kDisableInProcessStackTraces,
     sandbox::policy::switches::kDisableSeccompFilterSandbox,
     sandbox::policy::switches::kNoSandbox,
-diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-index 396b2983f403b0684f952a5fbd2d0abf947328f0..35c44065ba8980c06bb35e64aa33cc5b3f290953 100644
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -6194,7 +6194,7 @@ void WebGLRenderingContextBase::TexImageHelperImageBitmap(
-                                      : SkColorSpace::MakeSRGB();
-   const bool needs_color_conversion =
-       !SkColorSpace::Equals(unpack_color_space.get(), image_color_space.get());
-  if (needs_color_conversion) {
-+  if (needs_color_conversion && unpack_color_space) {
-     image = image->ConvertToColorSpace(unpack_color_space,
-                                        image->GetSkColorInfo().colorType());
-     if (!image) {
 diff --git a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
-index 648f25d99884b99f49e26cd9f280a8a6ae63e1c7..e42f8ba89070477b06777c7a0c37d30c8c5e4ed1 100644
+index 75d7af9a79d4e7f2cd39e45496ab5fff66407638..35b0bb908245330fbdc5205caa3299bf6fd8f7b4 100644
 --- a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
 +++ b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
@@ -4,6 +4,7 @@
@@ -317,7 +156,7 @@ index 648f25d99884b99f49e26cd9f280a8a6ae63e1c7..e42f8ba89070477b06777c7a0c37d30c
 }
 
 diff --git a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
-index 4187a703f62f36ff14d3a95f4b116febd5242c09..8d3b82e802bbd011380df21915427aba26193952 100644
+index bd070fbfc7f3abcef7c0d89a608fc52c31cf3be3..8f16aaa064c2455d02c7d8e1ff09364fdedcd0fa 100644
 --- a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
 +++ b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
@@ -24,6 +24,7 @@
@@ -328,7 +167,7 @@ index 4187a703f62f36ff14d3a95f4b116febd5242c09..8d3b82e802bbd011380df21915427aba
 #include "ui/native_theme/native_theme_features.h"
 #include "ui/native_theme/overlay_scrollbar_constants_aura.h"
 
-@@ -183,6 +184,9 @@ cc::LayerTreeSettings GenerateLayerTreeSettings(
+@@ -178,6 +179,9 @@ cc::LayerTreeSettings GenerateLayerTreeSettings(
   settings.main_frame_before_activation_enabled =
       cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation);
 
@@ -339,7 +178,7 @@ index 4187a703f62f36ff14d3a95f4b116febd5242c09..8d3b82e802bbd011380df21915427aba
   // is what the renderer uses if its not threaded.
   settings.enable_checker_imaging =
 diff --git a/ui/gfx/mac/io_surface.cc b/ui/gfx/mac/io_surface.cc
-index e36187917ecec5d9e40009d1c394a07e72281919..de9698d577ab48358d06362fc78575fd0ad98d30 100644
+index e030f01e72d18ef08d04ffbc72a5abb9a7b485c5..25155263bede8a465eb3f3bc2960f173c8f14935 100644
 --- a/ui/gfx/mac/io_surface.cc
 +++ b/ui/gfx/mac/io_surface.cc
@@ -20,6 +20,7 @@
@@ -357,7 +196,7 @@ index e36187917ecec5d9e40009d1c394a07e72281919..de9698d577ab48358d06362fc78575fd
 +  auto* cmd_line = base::CommandLine::ForCurrentProcess();
 +  if (cmd_line->HasSwitch(switches::kDisableColorCorrectRendering)) {
 +    base::ScopedCFTypeRef<CFDataRef> system_icc(
-+        CGColorSpaceCopyICCProfile(base::mac::GetSystemColorSpace()));
+        CGColorSpaceCopyICCData(base::mac::GetSystemColorSpace()));
 +    IOSurfaceSetValue(io_surface, CFSTR("IOSurfaceColorSpace"), system_icc);
 +    return true;
 +  }
@@ -365,7 +204,7 @@ index e36187917ecec5d9e40009d1c394a07e72281919..de9698d577ab48358d06362fc78575fd
   // Allow but ignore invalid color spaces.
   if (!color_space.IsValid())
     return true;
-@@ -312,6 +321,15 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size,
+@@ -311,6 +320,15 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size,
     DCHECK_EQ(kIOReturnSuccess, r);
   }
 
@@ -373,14 +212,14 @@ index e36187917ecec5d9e40009d1c394a07e72281919..de9698d577ab48358d06362fc78575fd
 +  if (cmd_line->HasSwitch(switches::kDisableColorCorrectRendering)) {
 +    CGColorSpaceRef color_space = base::mac::GetSystemColorSpace();
 +    base::ScopedCFTypeRef<CFDataRef> color_space_icc(
-+        CGColorSpaceCopyICCProfile(color_space));
+        CGColorSpaceCopyICCData(color_space));
 +    IOSurfaceSetValue(surface, CFSTR("IOSurfaceColorSpace"), color_space_icc);
 +    return surface;
 +  }
 +
   // Ensure that all IOSurfaces start as sRGB.
-   if (__builtin_available(macos 10.12, *)) {
-     IOSurfaceSetValue(surface, CFSTR("IOSurfaceColorSpace"), kCGColorSpaceSRGB);
+   IOSurfaceSetValue(surface, CFSTR("IOSurfaceColorSpace"), kCGColorSpaceSRGB);
+ 
 diff --git a/ui/gfx/switches.cc b/ui/gfx/switches.cc
 index 0e8044c6d87008c51fd165c6ef8bdc3687d6cc29..78015868927602b5225f252f0a9182f61b8431dc 100644
 --- a/ui/gfx/switches.cc
--- a/patches/chromium/disable_compositor_recycling.patch
+++ b/patches/chromium/disable_compositor_recycling.patch
@@ -6,10 +6,10 @@ 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 18c77a5520ea2ae7cfee4eea3ed01fa8a588829d..557b77bea785108359b0c78f12c2b2afbdc2475d 100644
+index ad65d6c50ce58dc8e3f49033c4d85d57675663fa..4ae0907fc7e15e2795e7eeafb2834c631eb8f3f6 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-@@ -511,7 +511,11 @@
+@@ -507,7 +507,11 @@
     return;
 
   host()->WasHidden();
--- a/patches/chromium/disable_freezing_flags_after_init_in_node.patch
+++ b/patches/chromium/disable_freezing_flags_after_init_in_node.patch
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Rose <japthorp@slack-corp.com>
+Date: Mon, 20 Jun 2022 14:53:37 -0700
+Subject: disable freezing flags after init in node
+
+This was introduced in
+https://chromium-review.googlesource.com/c/chromium/src/+/3687671.
+
+When running node in the renderer, flags are updated after initialization, so
+freezing the flags in Blink causes node initialization to fail.
+
+If possible, it would be ideal to do this without a patch.
+https://bugs.chromium.org/p/v8/issues/detail?id=12887 suggests that there may
+at some point be an API to "unfreeze" the flags, or we may be able to refactor
+node initialization to not update flags after V8 initialization.
+
+diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
+index 02b4f803369202a81f2d54f3b35aef04be13dfa2..76dd21fc8e97c1a2836ae5a5a11b56334a656fe2 100644
+--- a/content/renderer/render_process_impl.cc
+++ b/content/renderer/render_process_impl.cc
+@@ -222,7 +222,8 @@ RenderProcessImpl::RenderProcessImpl()
+   SetV8FlagIfNotFeature(features::kWebAssemblyDynamicTiering,
+                         "--no-wasm-dynamic-tiering");
+ 
+-  v8::V8::SetFlagsFromString("--freeze-flags-after-init");
+  // This conflicts with node in the renderer.
+  //v8::V8::SetFlagsFromString("--freeze-flags-after-init");
+ 
+ #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64)
+   if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) {
--- a/patches/chromium/disable_gpu_acceleration_on_vmware_on_linux.patch
+++ b/patches/chromium/disable_gpu_acceleration_on_vmware_on_linux.patch
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zhenyao Mo <zmo@chromium.org>
-Date: Mon, 23 May 2022 21:43:16 +0000
-Subject: Disable GPU acceleration on VMware on Linux
-
-TEST=manual
-R=sunnyps@chromium.org
-
-Bug: 1327939
-Change-Id: Ib09b6623665ffecf0af1f9f8bc3ebef1ac042b2f
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3661941
-Auto-Submit: Zhenyao Mo <zmo@chromium.org>
-Commit-Queue: Zhenyao Mo <zmo@chromium.org>
-Commit-Queue: Maggie Chen <magchen@chromium.org>
-Reviewed-by: Maggie Chen <magchen@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1006613}
-
-diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json
-index 8ed8faf0a0733568a81d955a5546d864d24f78b5..73b6e998f753cee5d77e6bd5983ed46702f13580 100644
--- a/gpu/config/software_rendering_list.json
-+++ b/gpu/config/software_rendering_list.json
-@@ -1699,6 +1699,18 @@
-       "features": [
-         "accelerated_video_encode"
-       ]
-+    },
-+    {
-+      "id": 176,
-+      "description": "VMware is buggy on Linux",
-+      "cr_bugs": [1327939],
-+      "os": {
-+        "type": "linux"
-+      },
-+      "vendor_id": "0x15ad",
-+      "features": [
-+        "all"
-+      ]
-     }
-   ]
- }
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@@ -6,10 +6,10 @@ 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 9e740edbf36dd7a30062c88f857103c56eebd729..7cda66952e0d3a67c32791ad3c7d7de8df03f876 100644
+index 18133ca75853394e616c3a816c1eb74b7da23fd9..273750752cdef18ccd7d54b9b28c524375bb3e8d 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -808,6 +808,9 @@ void RenderWidgetHostImpl::WasHidden() {
+@@ -809,6 +809,9 @@ void RenderWidgetHostImpl::WasHidden() {
   if (is_hidden_)
     return;
 
@@ -20,10 +20,10 @@ index 9e740edbf36dd7a30062c88f857103c56eebd729..7cda66952e0d3a67c32791ad3c7d7de8
       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 23783e5e004b613c27fd753e1f7ff96d51fa5f68..225b4ea0c5ac74d6b6700c306182d003a972cedc 100644
+index 65297e78ee11fb3e7f662408f65a263f9ae8c550..62d3bef655580b1bad1077de797cdadc04721f8e 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
-@@ -886,6 +886,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
+@@ -879,6 +879,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
 
   SiteInstanceGroup* GetSiteInstanceGroup();
 
@@ -34,10 +34,10 @@ index 23783e5e004b613c27fd753e1f7ff96d51fa5f68..225b4ea0c5ac74d6b6700c306182d003
   // |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 5f29761ad8556e730dca6b076b87f6391313fb95..3e5f5a34150079bf74d612bff85b6875ad41d2e6 100644
+index 870cdf73fd5eeab985fc43dc92d7919d18e4e622..04bfe1f1205b06a7e105f613014540fd72b17328 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -605,7 +605,7 @@ void RenderWidgetHostViewAura::HideImpl() {
+@@ -592,7 +592,7 @@ void RenderWidgetHostViewAura::HideImpl() {
   DCHECK(visibility_ == Visibility::HIDDEN ||
          visibility_ == Visibility::OCCLUDED);
 
--- 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 c289c888bc9d74d3f696714650b65aa373be27b4..aad7ec5ed0b6f6ab5cdfe0d7902d952c7c9e36c6 100644
+index 0588899a89dda616a0d9e67f31652a53bbca2f82..17eb966009f2c10198602fb38dd5ac903da17ad2 100644
 --- a/content/browser/renderer_host/navigator.cc
 +++ b/content/browser/renderer_host/navigator.cc
-@@ -1286,6 +1286,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1299,6 +1299,7 @@ void Navigator::RecordNavigationMetrics(
             .InMilliseconds());
   }
 
@@ -35,7 +35,7 @@ index c289c888bc9d74d3f696714650b65aa373be27b4..aad7ec5ed0b6f6ab5cdfe0d7902d952c
   // 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 &&
-@@ -1332,6 +1333,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1349,6 +1350,7 @@ void Navigator::RecordNavigationMetrics(
          first_before_unload_start_time)
             .InMilliseconds());
   }
--- a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
+++ b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
@@ -6,7 +6,7 @@ Subject: Don't run PCScan functions if PCScan is disabled
 PCScan should not be invoked if PCScan is disabled.  Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/2916657.

 diff --git a/base/allocator/partition_allocator/memory_reclaimer.cc b/base/allocator/partition_allocator/memory_reclaimer.cc
-index d871ceecd76e21b23c500643363ced2ca87e8013..e0a26a90ee38342aefdbdd76e9c56a932b214235 100644
+index 1e54559bd5f9a2ee889b921379d70c51e902502d..6797a076b612ad4ed6d5ce7d9868d944fae3694f 100644
 --- a/base/allocator/partition_allocator/memory_reclaimer.cc
 +++ b/base/allocator/partition_allocator/memory_reclaimer.cc
@@ -66,7 +66,7 @@ void MemoryReclaimer::Reclaim(int flags) {
@@ -19,7 +19,7 @@ index d871ceecd76e21b23c500643363ced2ca87e8013..e0a26a90ee38342aefdbdd76e9c56a93
     using PCScan = internal::PCScan;
     const auto invocation_mode = flags & PurgeFlags::kAggressiveReclaim
 diff --git a/base/threading/platform_thread_posix.cc b/base/threading/platform_thread_posix.cc
-index d51b37c8a2df11f71fa6056193100d00883db43d..b44002788cf4d4f5d754dd35dd193be233e6ebcb 100644
+index fb5df2ee7c40e93bf2ebf625b14d08044006534b..67aecdd1d70ff58eb5b1b8b67990a7448a3b1ba4 100644
 --- a/base/threading/platform_thread_posix.cc
 +++ b/base/threading/platform_thread_posix.cc
@@ -44,6 +44,7 @@
@@ -49,7 +49,7 @@ index d51b37c8a2df11f71fa6056193100d00883db43d..b44002788cf4d4f5d754dd35dd193be2
 #endif
 
 diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thread_win.cc
-index 8542c0d0d49511298cca800a59796b1e4271a3d8..1d0eeff5800f2ccf3f1fb6b1356c8cd067cfd945 100644
+index 5d01f8802e2144b9bb94d05b154bc5f5fa378b40..a872defd1c92f2ea590e5da1ecf34a6800dd4484 100644
 --- a/base/threading/platform_thread_win.cc
 +++ b/base/threading/platform_thread_win.cc
@@ -30,6 +30,7 @@
--- 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 95966ce7f0eeb0a7f2822bef69b540ac6bfe298d..34c2bdc5d4dda2fb0bdf2a8c3e5f8f9a5e11b977 100644
+index f703ab8f616e9765ed3384654a271f251c16ac71..4f92c7c4a069d324b0d11a849937151143816f84 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -2398,7 +2398,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
+@@ -2370,7 +2370,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
 }
 
 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 ece3dfbee04cf941689e4f21f5176db010fda564..9fd052c00a484cd1acd2031fda79e6307fd01b60 100644
+index d7260950ca1ba9c71d9500560bc13314e78e2170..f6b37bdec2343d45447b419aeadbe2aa19493c3c 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
@@ -530,7 +530,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
@@ -19,10 +19,10 @@ index ece3dfbee04cf941689e4f21f5176db010fda564..9fd052c00a484cd1acd2031fda79e630
                                    aspect_ratio.height());
 }
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index a2f053c3e2588451458682aa6e86da52a591e1e7..9e38d55d7156986e48ed6dcb3522d77358bfdb75 100644
+index c6a0ac1c5dd98a41392bd170bb0ada7418f17453..738a56e976a510fcdb44020193cc79522bae0855 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -936,8 +936,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
+@@ -1001,8 +1001,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
 }
 
 void HWNDMessageHandler::SetAspectRatio(float aspect_ratio) {
--- a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
+++ b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
@@ -21,10 +21,10 @@ index c9b535eb083c250f4f874d8e6bd0c29ea9f3a10f..f220b8669507a4aea616b0dfbabda509
   v8::ZoneBackingAllocator* GetZoneBackingAllocator() override;
 #endif
 diff --git a/gin/v8_platform.cc b/gin/v8_platform.cc
-index 952023235d9f1905b64195f625dbb3b1af97f908..3d8b4cc17584e7ae8be0b77a073a0453bcd5b3ef 100644
+index 03cbb536f9a5a3f9aaf8fe2a5baac1d62e398e3a..2f4cf65a7b75e1dfe6c2b6e472040b2a0617b912 100644
 --- a/gin/v8_platform.cc
 +++ b/gin/v8_platform.cc
-@@ -366,6 +366,10 @@ PageAllocator* V8Platform::GetPageAllocator() {
+@@ -367,6 +367,10 @@ PageAllocator* V8Platform::GetPageAllocator() {
   return g_page_allocator.Pointer();
 }
 
--- a/patches/chromium/expose_setuseragent_on_networkcontext.patch
+++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch
@@ -33,10 +33,10 @@ index 14c71cc69388da46f62d9835e2a06fef0870da02..9481ea08401ae29ae9c1d960491b05b3
 
 }  // namespace net
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index f06a04983571623b542dba11933c4c95c3dcf398..606573a33573884baa173b796e1870b8defcda2a 100644
+index c90733c3f463a2b9a3f142a739061fa65d6905b8..372c00c77c4320847313bdba49ade7ae8ed3f699 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1407,6 +1407,13 @@ void NetworkContext::SetNetworkConditions(
+@@ -1414,6 +1414,13 @@ void NetworkContext::SetNetworkConditions(
                                       std::move(network_conditions));
 }
 
@@ -51,10 +51,10 @@ index f06a04983571623b542dba11933c4c95c3dcf398..606573a33573884baa173b796e1870b8
   // 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 2cd8707b120deb41683e13def5d446fd3bf93afe..c654d54cbb1427e700d918a94390c022b5b1cb14 100644
+index dd79f2c9fabf673d9e2c69830ef3513cb499d961..f7744a9610c669e53eb9ba4fe4f3bf48715a77ba 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -302,6 +302,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -299,6 +299,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
   void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
   void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
                             mojom::NetworkConditionsPtr conditions) override;
@@ -63,10 +63,10 @@ index 2cd8707b120deb41683e13def5d446fd3bf93afe..c654d54cbb1427e700d918a94390c022
   void SetEnableReferrers(bool enable_referrers) override;
 #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index b52e5a2230e96d55d7886bde331a505c58dd093a..757dd77b06cba44e832e86e729e44b1e9a427c49 100644
+index d0a041032449fad884d296090aadc16862ef0b2a..b6a2ed2857ee9cb838542d76a5c3031a28483a8b 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1087,6 +1087,9 @@ interface NetworkContext {
+@@ -1099,6 +1099,9 @@ interface NetworkContext {
   SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
                        NetworkConditions? conditions);
 
@@ -77,7 +77,7 @@ index b52e5a2230e96d55d7886bde331a505c58dd093a..757dd77b06cba44e832e86e729e44b1e
   SetAcceptLanguage(string new_accept_language);
 
 diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
-index d143a82b1fd021bb03b760b91e87c7714f5395b9..3c18369ff3ab80430e21caac03373605dad64a88 100644
+index 932610486c245972abee3226cb86cd88316865df..32c3979da750443cb44936b0b2376efa06adb593 100644
 --- a/services/network/test/test_network_context.h
 +++ b/services/network/test/test_network_context.h
@@ -136,6 +136,7 @@ class TestNetworkContext : public mojom::NetworkContext {
--- a/patches/chromium/extend_apply_webpreferences.patch
+++ b/patches/chromium/extend_apply_webpreferences.patch
@@ -12,10 +12,10 @@ Ideally we could add an embedder observer pattern here but that can be
 done in future work.

 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 f76a0ee0778d7b4e4df69a4c43b4a6bfdc89294d..45baa4d62cb4e5aebedebba993ddbc9f06711d35 100644
+index 818394c235c3f71289218098c7db77e00d156d92..e6a107124fd2e5f298d1e1c8246a015cce37d90d 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -159,6 +159,7 @@
+@@ -161,6 +161,7 @@
 #include "third_party/blink/renderer/core/timing/window_performance.h"
 #include "third_party/blink/renderer/platform/fonts/font_cache.h"
 #include "third_party/blink/renderer/platform/fonts/generic_font_family_settings.h"
@@ -23,7 +23,7 @@ index f76a0ee0778d7b4e4df69a4c43b4a6bfdc89294d..45baa4d62cb4e5aebedebba993ddbc9f
 #include "third_party/blink/renderer/platform/graphics/image.h"
 #include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
 #include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
-@@ -1776,6 +1777,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
+@@ -1788,6 +1789,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
 #if BUILDFLAG(IS_MAC)
   web_view_impl->SetMaximumLegibleScale(
       prefs.default_maximum_page_scale_factor);
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .0.14
 .0.1