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 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc index ec0df47ff011..09dba6c1e236 100644 --- a/www/chromium/files/patch-base_process_memory__unittest.cc +++ b/www/chromium/files/patch-base_process_memory__unittest.cc @@ -1,15 +1,15 @@ ---- base/process/memory_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/process/memory_unittest.cc.orig 2021-07-19 18:45:05 UTC +++ base/process/memory_unittest.cc -@@ -38,6 +38,8 @@ +@@ -37,6 +37,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_WIN) -@@ -110,9 +112,9 @@ TEST(MemoryTest, AllocatorShimWorking) { + #if defined(OS_ANDROID) + #include "base/android/build_info.h" +@@ -112,9 +114,9 @@ TEST(MemoryTest, AllocatorShimWorking) { #endif } @@ -21,7 +21,7 @@ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) namespace { -@@ -307,7 +309,7 @@ TEST_F(OutOfMemoryDeathTest, SecurityAlignedRealloc) { +@@ -336,7 +338,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({ -@@ -353,7 +355,7 @@ TEST_F(OutOfMemoryDeathTest, ViaSharedLibraries) { +@@ -382,7 +384,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) -@@ -504,7 +506,7 @@ TEST_F(OutOfMemoryTest, TerminateBecauseOutOfMemoryRep +@@ -533,7 +535,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*)) { -@@ -562,7 +564,7 @@ TEST_F(OutOfMemoryHandledTest, NewReleasesReservation) +@@ -591,7 +593,7 @@ TEST_F(OutOfMemoryHandledTest, NewReleasesReservation) [](size_t size) { return static_cast<void*>(new char[size]); }, [](void* ptr) { delete[] static_cast<char*>(ptr); }); } @@ -57,7 +57,7 @@ // defined(OS_CHROMEOS)) // See the comment in |UncheckedMalloc()|, it behaves as malloc() in these -@@ -624,5 +626,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { +@@ -653,5 +655,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { #endif // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) || defined(OS_ANDROID) |