AUTOMATED - git apply results

build/patches/00Eyeo-Adblock.patch

@@ -161573,7 +161573,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums
  </enum>
  
  <enum name="ExtensionPointEnableState">
-@@ -97872,6 +97907,8 @@ Full version information for the fingerprint enum values:
+@@ -97874,6 +97909,8 @@ Full version information for the fingerprint enum values:
    <int value="29" label="kMediaStorageIdSalt"/>
    <int value="30" label="kModuleBlocklistCacheMD5Digest"/>
    <int value="32" label="kMediaCdmOriginData"/>

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

@@ -84,7 +84,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
-@@ -2497,9 +2497,9 @@
+@@ -2502,9 +2502,9 @@
      "expiry_milestone": 115
    },
    {

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

@@ -1768,7 +1768,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
      }
  
      /**
-@@ -429,6 +432,10 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
+@@ -430,6 +433,10 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
              if (mOptimizationsEnabled) {
                  autocompleteSchemeClassifier = mChromeAutocompleteSchemeClassifier;
                  cachedSpannableDisplayText = mSpannableDisplayTextCache.get(cacheKey);
@@ -1779,7 +1779,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
              } else {
                  autocompleteSchemeClassifier = new ChromeAutocompleteSchemeClassifier(getProfile());
              }
-@@ -446,7 +453,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
+@@ -447,7 +454,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
                      }
                  }
              } finally {

build/patches/Disable-text-fragments-by-default.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-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -2796,6 +2796,11 @@
+@@ -2801,6 +2801,11 @@
      "owners": [ "alionadangla", "bwwilliams", "bling-flags@google.com"],
      "expiry_milestone": 110
    },

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
-@@ -4140,9 +4140,9 @@
+@@ -4145,9 +4145,9 @@
      "expiry_milestone": 110
    },
    {

build/patches/Move-navigation-bar-to-bottom.patch

@@ -818,7 +818,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
-@@ -375,7 +375,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate
+@@ -376,7 +376,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate
          // position 0 is on the left. Account for that in the offset calculation.
          boolean isRtl = LocalizationUtils.isLayoutRtl();
          boolean useUnadjustedScrollOffset = isRtl != isLeft;

build/patches/Restore-Search-Ready-Omnibox-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-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -2769,6 +2769,11 @@
+@@ -2774,6 +2774,11 @@
      //  with neural net palm detection.
      "expiry_milestone": 90
    },

build/patches/Restore-offline-indicator-v2-flag.patch

@@ -141,7 +141,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 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
-@@ -4971,6 +4971,11 @@
+@@ -4976,6 +4976,11 @@
      "owners": [ "adamta", "sczs" ],
      "expiry_milestone": 98
    },

build/patches/Revert-flags-remove-num-raster-threads.patch

@@ -44,7 +44,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 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
-@@ -4752,6 +4752,11 @@
+@@ -4757,6 +4757,11 @@
      "owners": [ "yhirano", "network-service-dev" ],
      "expiry_milestone": 120
    },

build/patches/Unexpire-tab-groups-flags.patch

@@ -14,7 +14,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
-@@ -3095,7 +3095,7 @@
+@@ -3100,7 +3100,7 @@
    {
      "name": "enable-tab-groups",
      "owners": [ "memex-team@google.com" ],
@@ -23,7 +23,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
    },
    {
      "name": "enable-tab-groups-continuation",
-@@ -3110,7 +3110,7 @@
+@@ -3115,7 +3115,7 @@
    {
      "name": "enable-tab-groups-ui-improvements",
      "owners": [ "memex-team@google.com" ],