Remove abseil patch to disable HW accelerated hash Instead rely on recently added ABSL_OPTION_INLINE_HW_ACCEL_STRATEGY that does the same in abseil supported way Bug: 475029685 Change-Id: I1cf533eee83601f523994d2b34836ae80883270e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7777429 Reviewed-by: Mirko Bonadei <mbonadei@chromium.org> Auto-Submit: Danil Chapovalov <danilchap@chromium.org> Commit-Queue: Danil Chapovalov <danilchap@chromium.org> Cr-Commit-Position: refs/heads/main@{#1618036} NOKEYCHECK=True GitOrigin-RevId: 6796ba033c169e7760d790824521f09dea879a08

diff --git a/absl/hash/internal/hash.h b/absl/hash/internal/hash.h
index 8a6e83b..760dd8c 100644
--- a/absl/hash/internal/hash.h
+++ b/absl/hash/internal/hash.h

@@ -1191,11 +1191,6 @@
   return CombineLargeContiguousImplOn32BitLengthGt8(state, first, len);
 }
 
-// TODO: crbug.com/475029685 - Remove this #undef once Abseil has fixed the
-// policy about inline functions with different implementations based on
-// target CPU flags since this risks ODR violations (see bug).
-#undef ABSL_HASH_INTERNAL_HAS_CRC32
-
 #ifdef ABSL_HASH_INTERNAL_HAS_CRC32
 inline uint64_t CombineContiguousImpl(
     uint64_t state, const unsigned char* first, size_t len,

diff --git a/patches/0006-undef-absl-hash-internal-has-crc32.patch b/patches/0006-undef-absl-hash-internal-has-crc32.patch
deleted file mode 100644
index 8919636..0000000
--- a/patches/0006-undef-absl-hash-internal-has-crc32.patch
+++ /dev/null

@@ -1,16 +0,0 @@
-diff --git a/third_party/abseil-cpp/absl/hash/internal/hash.h b/third_party/abseil-cpp/absl/hash/internal/hash.h
-index 37bd39d60a06d..5918a0dfed667 100644
---- a/third_party/abseil-cpp/absl/hash/internal/hash.h
-+++ b/third_party/abseil-cpp/absl/hash/internal/hash.h
-@@ -1131,6 +1131,11 @@ inline uint64_t CombineContiguousImpl(
-   return CombineLargeContiguousImplOn32BitLengthGt8(state, first, len);
- }
- 
-+// TODO: crbug.com/475029685 - Remove this #undef once Abseil has fixed the
-+// policy about inline functions with different implementations based on
-+// target CPU flags since this risks ODR violations (see bug).
-+#undef ABSL_HASH_INTERNAL_HAS_CRC32
-+
- #ifdef ABSL_HASH_INTERNAL_HAS_CRC32
- inline uint64_t CombineContiguousImpl(
-     uint64_t state, const unsigned char* first, size_t len,