summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_process_memory__unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base_process_memory__unittest.cc')
-rw-r--r--www/chromium/files/patch-base_process_memory__unittest.cc67
1 files changed, 0 insertions, 67 deletions
diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc
deleted file mode 100644
index 3b2bc7a8d784..000000000000
--- a/www/chromium/files/patch-base_process_memory__unittest.cc
+++ /dev/null
@@ -1,67 +0,0 @@
---- base/process/memory_unittest.cc.orig 2021-12-14 11:44:55 UTC
-+++ base/process/memory_unittest.cc
-@@ -38,6 +38,8 @@
- #if defined(OS_LINUX) || defined(OS_CHROMEOS)
- #include <malloc.h>
- #include "base/test/malloc_wrapper.h"
-+#elif defined(OS_BSD)
-+#include "base/test/malloc_wrapper.h"
- #endif
- #if defined(OS_ANDROID)
- #include "base/android/build_info.h"
-@@ -113,9 +115,9 @@ TEST(MemoryTest, AllocatorShimWorking) {
- #endif
- }
-
--// OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan
-+// BSD does not support these tests. Don't test these on ASan/TSan/MSan
- // configurations: only test the real allocator.
--#if !defined(OS_OPENBSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \
-+#if !defined(OS_BSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \
- !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
-
- namespace {
-@@ -338,7 +340,7 @@ TEST_F(OutOfMemoryDeathTest, SecurityAlignedRealloc) {
- #endif // defined(OS_WIN)
- #endif // !defined(OS_MAC) && !defined(OS_ANDROID)
-
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-
- TEST_F(OutOfMemoryDeathTest, Valloc) {
- ASSERT_OOM_DEATH({
-@@ -384,7 +386,7 @@ TEST_F(OutOfMemoryDeathTest, ViaSharedLibraries) {
- value_ = MallocWrapper(test_size_);
- });
- }
--#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-
- // Android doesn't implement posix_memalign().
- #if defined(OS_POSIX) && !defined(OS_ANDROID)
-@@ -535,7 +537,7 @@ TEST_F(OutOfMemoryTest, TerminateBecauseOutOfMemoryRep
- #endif // OS_WIN
-
- #if defined(ARCH_CPU_32_BITS) && \
-- (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS))
-+ (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD))
-
- void TestAllocationsReleaseReservation(void* (*alloc_fn)(size_t),
- void (*free_fn)(void*)) {
-@@ -593,7 +595,7 @@ TEST_F(OutOfMemoryHandledTest, NewReleasesReservation)
- [](size_t size) { return static_cast<void*>(new char[size]); },
- [](void* ptr) { delete[] static_cast<char*>(ptr); });
- }
--#endif // defined(ARCH_CPU_32_BITS) && (defined(OS_WIN) || defined(OS_LINUX) ||
-+#endif // defined(ARCH_CPU_32_BITS) && (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) ||
- // defined(OS_CHROMEOS))
-
- #if defined(OS_ANDROID) || defined(OS_FUCHSIA)
-@@ -654,7 +656,6 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) {
- EXPECT_EQ(0, bytes[i]);
- free(value_);
-
-- EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_));
- EXPECT_TRUE(value_ == nullptr);
- }
-