Chromium Code Reviews| Index: chrome/installer/setup/memory_unittest.cc |
| diff --git a/chrome/installer/setup/memory_unittest.cc b/chrome/installer/setup/memory_unittest.cc |
| index a7968e37dcbe5cc993a34bdc117c3c34ba4efd40..d254ba50b44e572c14c39d55100ddf3236958027 100644 |
| --- a/chrome/installer/setup/memory_unittest.cc |
| +++ b/chrome/installer/setup/memory_unittest.cc |
| @@ -6,6 +6,7 @@ |
| #include <limits> |
| +#include "base/allocator/features.h" |
| #include "base/process/memory.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| @@ -13,7 +14,7 @@ |
| #include "base/allocator/allocator_interception_mac.h" |
| #endif |
| -#if defined(ALLOCATOR_SHIM) |
| +#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM) |
|
Sigurður Ásgeirsson
2017/05/25 12:54:21
OT: is it not time to drop the _EXPERIMENTAL_ in t
|
| // Test that the allocator shim is in-place so that base::UncheckedMalloc works. |
| TEST(OutOfMemoryHandledTest, UncheckedMalloc) { |
| // Enable termination on OOM - just as setup.exe does at early initialization |
| @@ -40,4 +41,4 @@ TEST(OutOfMemoryHandledTest, UncheckedMalloc) { |
| base::allocator::UninterceptMallocZonesForTesting(); |
| #endif |
| } |
| -#endif // ALLOCATOR_SHIM |
| +#endif // BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM) |