Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Unified Diff: base/process/memory_unittest.cc

Issue 2137453003: mac: Remove IsOSMavericksOrLater() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cfallocator_1012
Patch Set: rebase Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/mac/mac_util_unittest.mm ('k') | base/process/process_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_);
« no previous file with comments | « base/mac/mac_util_unittest.mm ('k') | base/process/process_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698