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

Unified Diff: base/process_util_unittest.cc

Issue 10908245: unchecked_malloc() for Skia on OSX. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Oops, GetPurgeableZone() was exported for tests. Created 8 years, 3 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/process_util_mac.mm ('k') | skia/ext/SkMemory_new_handler.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/process_util_unittest.cc
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc
index 6eccb90464470c9a1e328d0a26aa2052941b9dc5..f26dd6630a8cc36b53f136248c4df07d34253a41 100644
--- a/base/process_util_unittest.cc
+++ b/base/process_util_unittest.cc
@@ -1118,7 +1118,7 @@ TEST_F(OutOfMemoryDeathTest, Posix_memalign) {
// Purgeable zone tests (if it exists)
TEST_F(OutOfMemoryDeathTest, MallocPurgeable) {
- malloc_zone_t* zone = base::GetPurgeableZone();
+ malloc_zone_t* zone = malloc_default_purgeable_zone();
if (zone)
Avi (use Gerrit) 2012/09/13 20:21:25 Do we need these if calls? The default purgeable z
Scott Hess - ex-Googler 2012/09/13 21:15:47 Tough crowd!
ASSERT_DEATH({
SetUpInDeathAssert();
@@ -1127,7 +1127,7 @@ TEST_F(OutOfMemoryDeathTest, MallocPurgeable) {
}
TEST_F(OutOfMemoryDeathTest, ReallocPurgeable) {
- malloc_zone_t* zone = base::GetPurgeableZone();
+ malloc_zone_t* zone = malloc_default_purgeable_zone();
if (zone)
ASSERT_DEATH({
SetUpInDeathAssert();
@@ -1136,7 +1136,7 @@ TEST_F(OutOfMemoryDeathTest, ReallocPurgeable) {
}
TEST_F(OutOfMemoryDeathTest, CallocPurgeable) {
- malloc_zone_t* zone = base::GetPurgeableZone();
+ malloc_zone_t* zone = malloc_default_purgeable_zone();
if (zone)
ASSERT_DEATH({
SetUpInDeathAssert();
@@ -1145,7 +1145,7 @@ TEST_F(OutOfMemoryDeathTest, CallocPurgeable) {
}
TEST_F(OutOfMemoryDeathTest, VallocPurgeable) {
- malloc_zone_t* zone = base::GetPurgeableZone();
+ malloc_zone_t* zone = malloc_default_purgeable_zone();
if (zone)
ASSERT_DEATH({
SetUpInDeathAssert();
@@ -1154,7 +1154,7 @@ TEST_F(OutOfMemoryDeathTest, VallocPurgeable) {
}
TEST_F(OutOfMemoryDeathTest, PosixMemalignPurgeable) {
- malloc_zone_t* zone = base::GetPurgeableZone();
+ malloc_zone_t* zone = malloc_default_purgeable_zone();
typedef void* (*zone_memalign_t)(malloc_zone_t*, size_t, size_t);
// malloc_zone_memalign only exists on >= 10.6. Use dlsym to grab it at
« no previous file with comments | « base/process_util_mac.mm ('k') | skia/ext/SkMemory_new_handler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698