Git apply result for next-v120 branch

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

@@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 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
-@@ -6879,9 +6879,9 @@
+@@ -6884,9 +6884,9 @@
      "expiry_milestone": 121
    },
    {
@@ -29,7 +29,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
-@@ -2995,7 +2995,7 @@ const char kResetShortcutCustomizationsDescription[] =
+@@ -3001,7 +3001,7 @@ const char kResetShortcutCustomizationsDescription[] =
 
  const char kRestrictGamepadAccessName[] = "Restrict gamepad access";
  const char kRestrictGamepadAccessDescription[] =

build/patches/00Add-cromite-flags-support.patch

@@ -1187,7 +1187,7 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp
 diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -2218,5 +2218,6 @@ bool IsKeepAliveURLLoaderServiceEnabled() {
+@@ -2222,5 +2222,6 @@ bool IsKeepAliveURLLoaderServiceEnabled() {
           base::FeatureList::IsEnabled(kFetchLaterAPI);
  }
 
@@ -1197,7 +1197,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
 diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
 --- a/third_party/blink/public/common/features.h
 +++ b/third_party/blink/public/common/features.h
-@@ -1424,6 +1424,7 @@ BLINK_COMMON_EXPORT bool IsKeepAliveURLLoaderServiceEnabled();
+@@ -1427,6 +1427,7 @@ BLINK_COMMON_EXPORT bool IsKeepAliveURLLoaderServiceEnabled();
  BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(
      kRemoveAuthroizationOnCrossOriginRedirect);
 

build/patches/00Add-support-to-jxl.patch

@@ -2661,7 +2661,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums
  </enum>
 
  <enum name="DecodeSwapChainNotUsedReason">
-@@ -66332,6 +66332,7 @@ from previous Chrome versions.
+@@ -66334,6 +66334,7 @@ from previous Chrome versions.
    <int value="188610022" label="NewMessageListView:enabled"/>
    <int value="189728101" label="FasterLocationReload:disabled"/>
    <int value="189777537" label="DisableInitialMostVisitedFadeIn:enabled"/>

build/patches/AImageReader-CFI-crash-mitigations.patch

@@ -86,7 +86,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
 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
-@@ -2837,9 +2837,9 @@
+@@ -2842,9 +2842,9 @@
      "expiry_milestone": 125
    },
    {

build/patches/Enable-Certificate-Transparency.patch

@@ -37,15 +37,15 @@ diff --git a/chrome/browser/browser_features.h b/chrome/browser/browser_features
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -981,7 +981,6 @@ void SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting(
+@@ -986,7 +986,6 @@ void SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting(
  bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() {
    if (certificate_transparency_enabled_for_testing_.has_value())
      return certificate_transparency_enabled_for_testing_.value();
 -#if defined(OFFICIAL_BUILD)
  // TODO(carlosil): Figure out if we can/should remove the OFFICIAL_BUILD
  // check now that enforcement does not rely on build dates.
  //    Certificate Transparency is enabled:
-@@ -989,10 +988,7 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() {
+@@ -994,10 +993,7 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() {
  //   - on an opt-in basis for other builds and embedders, controlled with the
  //     kCertificateTransparencyAskBeforeEnabling flag
    return base::FeatureList::IsEnabled(

build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch

@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -4694,9 +4694,9 @@
+@@ -4699,9 +4699,9 @@
      "expiry_milestone": 120
    },
    {

build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch

@@ -381,7 +381,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
    pref_change_registrar_.Add(
        prefs::kExplicitlyAllowedNetworkPorts,
        base::BindRepeating(
-@@ -653,6 +656,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -658,6 +661,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
    // the system NetworkContext, and the per-profile pref values are used for
    // the profile NetworkContexts.
    registry->RegisterBooleanPref(prefs::kEnableReferrers, true);

build/patches/Restore-Search-Ready-Omnibox-flag.patch

@@ -66,7 +66,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
          }
          mHeaderProcessor = new HeaderProcessor(context);
 -        registerSuggestionProcessor(
-+        mEditUrlSuggestionProcessor = 
++        mEditUrlSuggestionProcessor =
                  new EditUrlSuggestionProcessor(
 -                        context, host, mImageSupplier, mActivityTabSupplier, shareSupplier));
 +                        context, host, mImageSupplier, mActivityTabSupplier, shareSupplier);