unchecked_malloc() for Skia on OSX.

base/process_util_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #define _CRT_SECURE_NO_WARNINGS
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 1100 matching lines @@
       }, "");
   }
 }
 #endif  // defined(OS_POSIX) && !defined(OS_ANDROID)
 
 #if defined(OS_MACOSX)
 
 // 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 zone will exist post 10.6.

[Scott Hess - ex-Googler, 2012/09/13 21:15:47]

Tough crowd!

     ASSERT_DEATH({
         SetUpInDeathAssert();
         value_ = malloc_zone_malloc(zone, test_size_);
       }, "");
 }
 
 TEST_F(OutOfMemoryDeathTest, ReallocPurgeable) {
-  malloc_zone_t* zone = base::GetPurgeableZone();
+  malloc_zone_t* zone = malloc_default_purgeable_zone();
   if (zone)
     ASSERT_DEATH({
         SetUpInDeathAssert();
         value_ = malloc_zone_realloc(zone, NULL, test_size_);
       }, "");
 }
 
 TEST_F(OutOfMemoryDeathTest, CallocPurgeable) {
-  malloc_zone_t* zone = base::GetPurgeableZone();
+  malloc_zone_t* zone = malloc_default_purgeable_zone();
   if (zone)
     ASSERT_DEATH({
         SetUpInDeathAssert();
         value_ = malloc_zone_calloc(zone, 1024, test_size_ / 1024L);
       }, "");
 }
 
 TEST_F(OutOfMemoryDeathTest, VallocPurgeable) {
-  malloc_zone_t* zone = base::GetPurgeableZone();
+  malloc_zone_t* zone = malloc_default_purgeable_zone();
   if (zone)
     ASSERT_DEATH({
         SetUpInDeathAssert();
         value_ = malloc_zone_valloc(zone, test_size_);
       }, "");
 }
 
 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
   // runtime because it may not be present in the SDK used for compilation.

[Scott Hess - ex-Googler, 2012/09/13 21:15:47]

Looks like I can fix this, too.

   zone_memalign_t zone_memalign =
       reinterpret_cast<zone_memalign_t>(
         dlsym(RTLD_DEFAULT, "malloc_zone_memalign"));
 
   if (zone && zone_memalign) {
     ASSERT_DEATH({
         SetUpInDeathAssert();
         value_ = zone_memalign(zone, 8, test_size_);
       }, "");
   }
@@ skipping 40 matching lines @@
       SetUpInDeathAssert();
       while ((value_ = base::AllocatePsychoticallyBigObjCObject())) {}
     }, "");
 }
 
 #endif  // !ARCH_CPU_64_BITS
 #endif  // OS_MACOSX
 
 #endif  // !defined(OS_ANDROID) && !defined(OS_OPENBSD) &&
         // !defined(OS_WIN) && !defined(ADDRESS_SANITIZER)