diff options
Diffstat (limited to 'base/process/memory_unittest.cc')
| -rw-r--r-- | base/process/memory_unittest.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/base/process/memory_unittest.cc b/base/process/memory_unittest.cc index 2e64fd7..50ba098 100644 --- a/base/process/memory_unittest.cc +++ b/base/process/memory_unittest.cc @@ -26,7 +26,6 @@ #endif #if defined(OS_LINUX) #include <malloc.h> -#include "base/test/malloc_wrapper.h" #endif #if defined(OS_WIN) @@ -235,11 +234,13 @@ TEST_F(OutOfMemoryDeathTest, Memalign) { TEST_F(OutOfMemoryDeathTest, ViaSharedLibraries) { // This tests that the run-time symbol resolution is overriding malloc for - // shared libraries as well as for our code. + // shared libraries (including libc itself) as well as for our code. + std::string format = base::StringPrintf("%%%zud", test_size_); + char *value = NULL; ASSERT_DEATH({ - SetUpInDeathAssert(); - value_ = MallocWrapper(test_size_); - }, ""); + SetUpInDeathAssert(); + EXPECT_EQ(-1, asprintf(&value, format.c_str(), 0)); + }, ""); } #endif // OS_LINUX |