aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc')
-rw-r--r--www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc
index 9a0e6af659a2..2c53c24036be 100644
--- a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc
+++ b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc
@@ -1,6 +1,6 @@
---- base/allocator/allocator_shim_unittest.cc.orig 2021-01-18 21:28:44 UTC
+--- base/allocator/allocator_shim_unittest.cc.orig 2021-03-12 23:57:15 UTC
+++ base/allocator/allocator_shim_unittest.cc
-@@ -367,7 +367,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
+@@ -369,7 +369,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
#endif // !OS_WIN
@@ -9,7 +9,7 @@
void* memalign_ptr = memalign(128, 53);
ASSERT_NE(nullptr, memalign_ptr);
ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(memalign_ptr) % 128);
-@@ -383,7 +383,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
+@@ -385,7 +385,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u);
#endif // !defined(OS_ANDROID)
@@ -18,7 +18,7 @@
// See allocator_shim_override_glibc_weak_symbols.h for why we intercept
// internal libc symbols.
-@@ -410,7 +410,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
+@@ -412,7 +412,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
free(zero_alloc_ptr);
ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u);
@@ -27,7 +27,7 @@
free(memalign_ptr);
ASSERT_GE(frees_intercepted_by_addr[Hash(memalign_ptr)], 1u);
-@@ -419,7 +419,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
+@@ -421,7 +421,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u);
#endif // !defined(OS_ANDROID)
@@ -36,7 +36,7 @@
#if !defined(OS_WIN)
free(posix_memalign_ptr);
-@@ -595,7 +595,7 @@ static size_t GetUsableSize(void* ptr) {
+@@ -614,7 +614,7 @@ static size_t GetUsableSize(void* ptr) {
static size_t GetUsableSize(void* ptr) {
return malloc_size(ptr);
}