diff options
Diffstat (limited to 'www/chromium/files/patch-base_process_memory__unittest.cc')
| -rw-r--r-- | www/chromium/files/patch-base_process_memory__unittest.cc | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc index 09dba6c1e236..3b2bc7a8d784 100644 --- a/www/chromium/files/patch-base_process_memory__unittest.cc +++ b/www/chromium/files/patch-base_process_memory__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/memory_unittest.cc.orig 2021-07-19 18:45:05 UTC +--- base/process/memory_unittest.cc.orig 2021-12-14 11:44:55 UTC +++ base/process/memory_unittest.cc -@@ -37,6 +37,8 @@ +@@ -38,6 +38,8 @@ #if defined(OS_LINUX) || defined(OS_CHROMEOS) #include <malloc.h> #include "base/test/malloc_wrapper.h" @@ -9,7 +9,7 @@ #endif #if defined(OS_ANDROID) #include "base/android/build_info.h" -@@ -112,9 +114,9 @@ TEST(MemoryTest, AllocatorShimWorking) { +@@ -113,9 +115,9 @@ TEST(MemoryTest, AllocatorShimWorking) { #endif } @@ -21,7 +21,7 @@ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) namespace { -@@ -336,7 +338,7 @@ TEST_F(OutOfMemoryDeathTest, SecurityAlignedRealloc) { +@@ -338,7 +340,7 @@ TEST_F(OutOfMemoryDeathTest, SecurityAlignedRealloc) { #endif // defined(OS_WIN) #endif // !defined(OS_MAC) && !defined(OS_ANDROID) @@ -30,7 +30,7 @@ TEST_F(OutOfMemoryDeathTest, Valloc) { ASSERT_OOM_DEATH({ -@@ -382,7 +384,7 @@ TEST_F(OutOfMemoryDeathTest, ViaSharedLibraries) { +@@ -384,7 +386,7 @@ TEST_F(OutOfMemoryDeathTest, ViaSharedLibraries) { value_ = MallocWrapper(test_size_); }); } @@ -39,7 +39,7 @@ // Android doesn't implement posix_memalign(). #if defined(OS_POSIX) && !defined(OS_ANDROID) -@@ -533,7 +535,7 @@ TEST_F(OutOfMemoryTest, TerminateBecauseOutOfMemoryRep +@@ -535,7 +537,7 @@ TEST_F(OutOfMemoryTest, TerminateBecauseOutOfMemoryRep #endif // OS_WIN #if defined(ARCH_CPU_32_BITS) && \ @@ -48,7 +48,7 @@ void TestAllocationsReleaseReservation(void* (*alloc_fn)(size_t), void (*free_fn)(void*)) { -@@ -591,7 +593,7 @@ TEST_F(OutOfMemoryHandledTest, NewReleasesReservation) +@@ -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); }); } @@ -56,11 +56,12 @@ +#endif // defined(ARCH_CPU_32_BITS) && (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS)) - // See the comment in |UncheckedMalloc()|, it behaves as malloc() in these -@@ -653,5 +655,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { + #if defined(OS_ANDROID) || defined(OS_FUCHSIA) +@@ -654,7 +656,6 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { + EXPECT_EQ(0, bytes[i]); + free(value_); - #endif // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) || defined(OS_ANDROID) +- EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_)); + EXPECT_TRUE(value_ == nullptr); + } --#endif // !defined(OS_OPENBSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && -+#endif // !defined(OS_BSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && - // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) |