chromium: Backport a patch

Backport a patch to fix building with CLANG 21.

Signed-off-by: Zoltán Böszörményi <[email protected]>

Author: zboszor

meta-chromium/recipes-browser/chromium/chromium-gn.inc

@@ -27,6 +27,7 @@ SRC_URI += "\
     file://0011-fix-check_version-Only-compare-node.js-major-version.patch \
     file://0012-chromium-fix-v4l2-compiler-error-on-arm.patch \
     file://6aae0e2353c857d98980ff677bf304288d7c58de.patch \
+    file://b0ff8c3b258a8816c05bdebf472dbba719d3c491.patch \
 "
 
 # ARM/AArch64-specific patches.

meta-chromium/recipes-browser/chromium/files/b0ff8c3b258a8816c05bdebf472dbba719d3c491.patch

@@ -0,0 +1,47 @@
+From b0ff8c3b258a8816c05bdebf472dbba719d3c491 Mon Sep 17 00:00:00 2001
+From: Hans Wennborg <[email protected]>
+Date: Tue, 10 Jun 2025 09:51:47 -0700
+Subject: [PATCH] Don't return an enum from EnumSizeTraits::Count
+
+`Enum::kMaxValue + 1` may be outside the representable range of the
+enum, which Clang will treat as an error in constexpr contexts (see
+bug).
+
+Bug: 423841920
+Change-Id: I629402cf93bd8419a71f94ff9ed9340d4f88a706
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6633292
+Auto-Submit: Hans Wennborg <[email protected]>
+Commit-Queue: Nico Weber <[email protected]>
+Reviewed-by: Nico Weber <[email protected]>
+Commit-Queue: Hans Wennborg <[email protected]>
+Cr-Commit-Position: refs/heads/main@{#1471871}
+
+Upstream-Status: Backport [https://github.com/chromium/chromium/commit/b0ff8c3b258a8816c05bdebf472dbba719d3c491]
+---
+ base/metrics/histogram_macros_internal.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/base/metrics/histogram_macros_internal.h b/base/metrics/histogram_macros_internal.h
+index 39b232bc1023b8..daa5515c2ab357 100644
+--- a/base/metrics/histogram_macros_internal.h
++++ b/base/metrics/histogram_macros_internal.h
+@@ -28,16 +28,16 @@ namespace base::internal {
+ template <typename Enum>
+   requires(std::is_enum_v<Enum>)
+ struct EnumSizeTraits {
+-  static constexpr Enum Count() {
++  static constexpr uintmax_t Count() {
+     if constexpr (requires { Enum::kMaxValue; }) {
+       // Since the UMA histogram macros expect a value one larger than the max
+       // defined enumerator value, add one.
+-      return static_cast<Enum>(base::to_underlying(Enum::kMaxValue) + 1);
++      return static_cast<uintmax_t>(base::to_underlying(Enum::kMaxValue) + 1);
+     } else {
+       static_assert(
+           sizeof(Enum) == 0,
+           "enumerator must define kMaxValue enumerator to use this macro!");
+-      return Enum();
++      return 0;
+     }
+   }
+ };