Index: base/process/memory_linux.cc |
diff --git a/base/process/memory_linux.cc b/base/process/memory_linux.cc |
index 985bc54eb64439c68878671134d014e26c1a8cfd..b6a513b8a0cf72b672029700b2a3c730db7b5578 100644 |
--- a/base/process/memory_linux.cc |
+++ b/base/process/memory_linux.cc |
@@ -46,7 +46,7 @@ void OnNoMemory() { |
// logic is implemented in the shim. |
#if !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER) && \ |
!defined(THREAD_SANITIZER) && !defined(LEAK_SANITIZER) && \ |
- !BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM) |
+ !BUILDFLAG(USE_ALLOCATOR_SHIM) |
#if defined(LIBC_GLIBC) && !defined(USE_TCMALLOC) |
@@ -150,7 +150,7 @@ void EnableTerminationOnOutOfMemory() { |
// If we're using glibc's allocator, the above functions will override |
// malloc and friends and make them die on out of memory. |
-#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM) |
+#if BUILDFLAG(USE_ALLOCATOR_SHIM) |
allocator::SetCallNewHandlerOnMallocFailure(true); |
#elif defined(USE_TCMALLOC) |
// For tcmalloc, we need to tell it to behave like new. |
@@ -196,7 +196,7 @@ bool AdjustOOMScore(ProcessId process, int score) { |
} |
bool UncheckedMalloc(size_t size, void** result) { |
-#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM) |
+#if BUILDFLAG(USE_ALLOCATOR_SHIM) |
*result = allocator::UncheckedAlloc(size); |
#elif defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || \ |
(!defined(LIBC_GLIBC) && !defined(USE_TCMALLOC)) |