Merge pull request #246 from uazo/create-pull-request/patch-7dcba72

Autorebase for "Bump to 116.0.5845.163"

build/patches/00Add-a-flag-to-disable-GamePad-API.patch

@@ -13,7 +13,7 @@ Adds restrict-gamepad-access flag (default active) to disable GamePad API.
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -6837,9 +6837,9 @@
+@@ -6842,9 +6842,9 @@
      "expiry_milestone": 117
    },
    {
@@ -28,7 +28,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -2981,7 +2981,7 @@ const char kReduceAcceptLanguageDescription[] =
+@@ -2984,7 +2984,7 @@ const char kReduceAcceptLanguageDescription[] =
 
  const char kRestrictGamepadAccessName[] = "Restrict gamepad access";
  const char kRestrictGamepadAccessDescription[] =

build/patches/00Add-setting-to-invert-tap-and-long-tap.patch

@@ -142,7 +142,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -7917,6 +7917,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7921,6 +7921,11 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kMoveTopToolbarToBottomDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(features::kMoveTopToolbarToBottom)},
 

build/patches/00Disable-speechSynthesis-getVoices-API.patch

@@ -23,7 +23,7 @@ Require: Timezone-customization.patch
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -7460,6 +7460,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7464,6 +7464,11 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kFileHandlingIconsDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(blink::features::kFileHandlingIcons)},
 

build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch

@@ -1520,7 +1520,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
  import("//components/captive_portal/core/features.gni")
  import("//components/enterprise/buildflags/buildflags.gni")
  import("//components/feed/features.gni")
-@@ -2544,10 +2543,6 @@ if (!is_android) {
+@@ -2545,10 +2544,6 @@ if (!is_android) {
        sources += [ "../browser/chrome_for_testing/chrome_for_testing_info_bar_browsertest.cc" ]
      }
 

build/patches/00Fonts-fingerprinting-mitigation.patch

@@ -32,7 +32,7 @@ fonts-fingerprint-mitigation flag, which is active by default.
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -10012,6 +10012,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10016,6 +10016,11 @@ const FeatureEntry kFeatureEntries[] = {
                                      kClipboardMaximumAgeVariations,
                                      "ClipboardMaximumAge")},
 

build/patches/00Internal-firewall.patch

@@ -72,7 +72,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  #include "services/media_session/public/cpp/features.h"
  #include "services/network/public/cpp/features.h"
  #include "services/network/public/cpp/network_switches.h"
-@@ -8122,6 +8123,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8126,6 +8127,11 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(page_info::kPageInfoHideSiteSettings)},
  #endif  // !BUILDFLAG(IS_ANDROID)
 

build/patches/00Keyboard-protection-flag.patch

@@ -35,7 +35,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3242,6 +3242,12 @@ const char kSystemKeyboardLockDescription[] =
+@@ -3245,6 +3245,12 @@ const char kSystemKeyboardLockDescription[] =
      "keyboard shortcuts and have the events routed directly to the website "
      "when in fullscreen mode.";
 
@@ -51,7 +51,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -1833,6 +1833,9 @@ extern const char kSuppressToolbarCapturesDescription[];
+@@ -1836,6 +1836,9 @@ extern const char kSuppressToolbarCapturesDescription[];
  extern const char kSystemKeyboardLockName[];
  extern const char kSystemKeyboardLockDescription[];
 

build/patches/00Log-dangling-attributes-in-some-html-elements.patch

@@ -82,7 +82,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
 --- a/third_party/blink/renderer/core/dom/element.cc
 +++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -2564,8 +2564,26 @@ void Element::StripScriptingAttributes(
+@@ -2550,8 +2550,26 @@ void Element::StripScriptingAttributes(
    attribute_vector.Shrink(destination);
  }
 

build/patches/00WIN-ADDTO-Add-AllowUserCertificates-flag.patch

@@ -9,7 +9,7 @@ Subject: WIN ADDTO Add AllowUserCertificates flag
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -9235,10 +9235,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9239,10 +9239,12 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kHttpsUpgradesDescription, kOsDesktop | kOsAndroid,
       FEATURE_VALUE_TYPE(features::kHttpsUpgrades)},
 

build/patches/00WIN-ADDTO-Add-bookmark-import-export-actions.patch

@@ -12,7 +12,7 @@ Subject: WIN ADDTO Add bookmark import/export actions
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -9462,11 +9462,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9466,11 +9466,13 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(net::features::kIsCleartextPermitted)},
  #endif
 

build/patches/00WIN-ADDTO-Experimental-user-scripts-support.patch

@@ -42,7 +42,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -8158,9 +8158,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8162,9 +8162,11 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryLongpress)},
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 

build/patches/00WIN-ADDTO-Restore-Search-Ready-Omnibox-flag.patch

@@ -9,7 +9,7 @@ Subject: WIN ADDTO Restore Search Ready Omnibox flag
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -9432,9 +9432,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9436,9 +9436,11 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kDesksTemplatesDescription, kOsCrOS,
       FEATURE_VALUE_TYPE(ash::features::kDesksTemplates)},
  #endif

build/patches/00Warning-message-for-unsupported-hardware-aes.patch

@@ -111,7 +111,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -7931,6 +7931,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7935,6 +7935,10 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kDevicePostureDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kDevicePosture)},
 

build/patches/Add-AllowUserCertificates-flag.patch

@@ -38,7 +38,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -9180,6 +9180,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9184,6 +9184,10 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kHttpsUpgradesDescription, kOsDesktop | kOsAndroid,
       FEATURE_VALUE_TYPE(features::kHttpsUpgrades)},
 

build/patches/Add-IsCleartextPermitted-flag.patch

@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -9391,6 +9391,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9395,6 +9395,10 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kRequestDesktopSiteExceptionsName,
       flag_descriptions::kRequestDesktopSiteExceptionsDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)},

build/patches/Add-an-always-incognito-mode.patch

@@ -1341,7 +1341,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -4044,6 +4044,12 @@ const char kOfflinePagesLivePageSharingDescription[] =
+@@ -4047,6 +4047,12 @@ const char kOfflinePagesLivePageSharingDescription[] =
      "Enables to share current loaded page as offline page by saving as MHTML "
      "first.";
 
@@ -1357,7 +1357,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -2355,6 +2355,9 @@ extern const char kOmahaMinSdkVersionAndroidDescription[];
+@@ -2358,6 +2358,9 @@ extern const char kOmahaMinSdkVersionAndroidDescription[];
  extern const char kOmahaMinSdkVersionAndroidMinSdk1Description[];
  extern const char kOmahaMinSdkVersionAndroidMinSdk1000Description[];
 

build/patches/Add-bookmark-import-export-actions.patch

@@ -834,7 +834,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -9357,6 +9357,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9361,6 +9361,12 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)},
  #endif
 
@@ -1346,7 +1346,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -7343,6 +7343,11 @@ const char kEnableAudioFocusEnforcementDescription[] =
+@@ -7346,6 +7346,11 @@ const char kEnableAudioFocusEnforcementDescription[] =
      "any one time. Requires #enable-media-session-service to be enabled too.";
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
@@ -1361,7 +1361,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -4243,6 +4243,9 @@ extern const char kEnableAudioFocusEnforcementName[];
+@@ -4246,6 +4246,9 @@ extern const char kEnableAudioFocusEnforcementName[];
  extern const char kEnableAudioFocusEnforcementDescription[];
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 

build/patches/Add-flag-to-configure-maximum-connections-per-host.patch

@@ -46,7 +46,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -2112,6 +2112,10 @@ const char kUnthrottledNestedTimeoutDescription[] =
+@@ -2115,6 +2115,10 @@ const char kUnthrottledNestedTimeoutDescription[] =
      "websites abusing the API will still eventually have their setTimeouts "
      "clamped.";
 
@@ -60,7 +60,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -1182,6 +1182,9 @@ extern const char kLogJsConsoleMessagesDescription[];
+@@ -1185,6 +1185,9 @@ extern const char kLogJsConsoleMessagesDescription[];
  extern const char kUnthrottledNestedTimeoutName[];
  extern const char kUnthrottledNestedTimeoutDescription[];
 

build/patches/Add-flag-to-disable-IPv6-probes.patch

@@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -6475,6 +6475,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6479,6 +6479,10 @@ const FeatureEntry kFeatureEntries[] = {
      {"enable-reader-mode-in-cct", flag_descriptions::kReaderModeInCCTName,
       flag_descriptions::kReaderModeInCCTDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)},
@@ -32,7 +32,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3821,6 +3821,10 @@ const char kCCTTextFragmentLookupApiEnabledName[] =
+@@ -3824,6 +3824,10 @@ const char kCCTTextFragmentLookupApiEnabledName[] =
  const char kCCTTextFragmentLookupApiEnabledDescription[] =
      "Enable CCT API to lookup text fragments";
 

build/patches/Add-flag-to-disable-external-intent-requests.patch

@@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -4112,6 +4112,12 @@ const char kPolicyLogsPageAndroidDescription[] =
+@@ -4115,6 +4115,12 @@ const char kPolicyLogsPageAndroidDescription[] =
      "Enable the new chrome://policy-logs page containing logs for debugging "
      "policy related issues on Android.";
 
@@ -46,7 +46,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -2408,6 +2408,9 @@ extern const char kQueryTilesNTPDescription[];
+@@ -2411,6 +2411,9 @@ extern const char kQueryTilesNTPDescription[];
  extern const char kQueryTilesOnStartName[];
  extern const char kQueryTilesOnStartDescription[];
  extern const char kQueryTilesSingleTierName[];

build/patches/Add-flag-to-disable-vibration.patch

@@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -7943,6 +7943,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7947,6 +7947,10 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)},
  #endif
 
@@ -33,7 +33,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -6959,6 +6959,9 @@ const char kLacrosMergeIcuDataFileDescription[] =
+@@ -6962,6 +6962,9 @@ const char kLacrosMergeIcuDataFileDescription[] =
      "Enables sharing common areas of icudtl.dat between Ash and Lacros.";
  #endif  // #if BUILDFLAG(IS_CHROMEOS_LACROS)
 
@@ -46,7 +46,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -4227,6 +4227,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];
+@@ -4230,6 +4230,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];
  extern const char kWebUITabStripTabDragIntegrationDescription[];
  #endif  // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH)
 

build/patches/Add-site-engagement-flag.patch

@@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  #include "components/shared_highlighting/core/common/shared_highlighting_features.h"
  #include "components/signin/core/browser/dice_account_reconcilor_delegate.h"
  #include "components/signin/public/base/signin_buildflags.h"
-@@ -9437,6 +9438,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9441,6 +9442,11 @@ const FeatureEntry kFeatureEntries[] = {
                                      kLargeFaviconFromGoogleVariations,
                                      "LargeFaviconFromGoogle")},
 
@@ -44,7 +44,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3691,6 +3691,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] =
+@@ -3694,6 +3694,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] =
      "Skips starting the service worker and run the fetch handler if the fetch "
      "handler is recognized as skippable.";
 
@@ -59,7 +59,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -2140,6 +2140,9 @@ extern const char kReduceAcceptLanguageDescription[];
+@@ -2143,6 +2143,9 @@ extern const char kReduceAcceptLanguageDescription[];
  extern const char kSkipServiceWorkerFetchHandlerName[];
  extern const char kSkipServiceWorkerFetchHandlerDescription[];
 

build/patches/Allow-building-without-supervised-users.patch

@@ -75,7 +75,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 
  const FeatureEntry::FeatureParam kChromeRefresh2023Level1[] = {{"level", "1"}};
 
-@@ -7689,11 +7691,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7693,11 +7695,13 @@ const FeatureEntry kFeatureEntries[] = {
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
  #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_ANDROID)

build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch

@@ -37,7 +37,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3611,6 +3611,11 @@ const char kWebrtcUseMinMaxVEADimensionsDescription[] =
+@@ -3614,6 +3614,11 @@ const char kWebrtcUseMinMaxVEADimensionsDescription[] =
      "When enabled, WebRTC will only use the Video Encode Accelerator for "
      "video resolutions inside those published as supported.";
 
@@ -52,7 +52,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -2083,6 +2083,9 @@ extern const char kWebRtcRemoteEventLogDescription[];
+@@ -2086,6 +2086,9 @@ extern const char kWebRtcRemoteEventLogDescription[];
  extern const char kWebrtcUseMinMaxVEADimensionsName[];
  extern const char kWebrtcUseMinMaxVEADimensionsDescription[];
 

build/patches/Bromite-subresource-adblocker.patch

@@ -438,7 +438,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
 --- a/chrome/app/generated_resources.grd
 +++ b/chrome/app/generated_resources.grd
-@@ -13752,6 +13752,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -13770,6 +13770,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
        Never show this again.
      </message>
 

build/patches/Content-settings-infrastructure.patch

@@ -542,7 +542,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
    return ContentSettingsType::DEFAULT;
  }
 
-@@ -508,6 +523,13 @@ base::StringPiece ContentSettingsTypeToGroupName(ContentSettingsType type) {
+@@ -514,6 +529,13 @@ base::StringPiece ContentSettingsTypeToGroupName(ContentSettingsType type) {
      }
    }
 
@@ -556,7 +556,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
    NOTREACHED() << static_cast<int32_t>(type)
                 << " is not a recognized content settings type.";
    return base::StringPiece();
-@@ -576,6 +598,13 @@ const std::vector<ContentSettingsType>& GetVisiblePermissionCategories() {
+@@ -582,6 +604,13 @@ const std::vector<ContentSettingsType>& GetVisiblePermissionCategories() {
        base_types->push_back(ContentSettingsType::PRIVATE_NETWORK_GUARD);
      }