Index: base/process/memory_unittest.cc |
diff --git a/base/process/memory_unittest.cc b/base/process/memory_unittest.cc |
index ec2ed9f1869df7f768a52125f05d6eb674785b3d..9b6ee5f5dfdd35167c726c8a8e3e2cfe9baa8c08 100644 |
--- a/base/process/memory_unittest.cc |
+++ b/base/process/memory_unittest.cc |
@@ -26,7 +26,6 @@ |
#endif |
#if defined(OS_MACOSX) |
#include <malloc/malloc.h> |
-#include "base/mac/mac_util.h" |
#include "base/process/memory_unittest_mac.h" |
#endif |
#if defined(OS_LINUX) |
@@ -409,13 +408,6 @@ class OutOfMemoryHandledTest : public OutOfMemoryTest { |
// under sanitizer tools. |
#if !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) |
TEST_F(OutOfMemoryHandledTest, UncheckedMalloc) { |
-#if defined(OS_MACOSX) && ARCH_CPU_32_BITS |
- // The Mavericks malloc library changed in a way which breaks the tricks used |
- // to implement EnableTerminationOnOutOfMemory() with UncheckedMalloc() under |
- // 32-bit. The 64-bit malloc library works as desired without tricks. |
- if (base::mac::IsOSMavericksOrLater()) |
- return; |
-#endif |
EXPECT_TRUE(base::UncheckedMalloc(kSafeMallocSize, &value_)); |
EXPECT_TRUE(value_ != NULL); |
free(value_); |
@@ -425,13 +417,6 @@ TEST_F(OutOfMemoryHandledTest, UncheckedMalloc) { |
} |
TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { |
-#if defined(OS_MACOSX) && ARCH_CPU_32_BITS |
- // The Mavericks malloc library changed in a way which breaks the tricks used |
- // to implement EnableTerminationOnOutOfMemory() with UncheckedCalloc() under |
- // 32-bit. The 64-bit malloc library works as desired without tricks. |
- if (base::mac::IsOSMavericksOrLater()) |
- return; |
-#endif |
EXPECT_TRUE(base::UncheckedCalloc(1, kSafeMallocSize, &value_)); |
EXPECT_TRUE(value_ != NULL); |
const char* bytes = static_cast<const char*>(value_); |