| Index: base/process/memory_mac.mm
|
| diff --git a/base/process/memory_mac.mm b/base/process/memory_mac.mm
|
| index 4d719f8054e69398f1f40da51f26f4d7b9ca11b3..17249a239b9fdddeea853250431d8bdf7369943a 100644
|
| --- a/base/process/memory_mac.mm
|
| +++ b/base/process/memory_mac.mm
|
| @@ -246,7 +246,7 @@ void oom_killer_new() {
|
| // === Core Foundation CFAllocators ===
|
|
|
| bool CanGetContextForCFAllocator() {
|
| - return !base::mac::IsOSLaterThanYosemite_DontCallThis();
|
| + return !base::mac::IsOSLaterThanElCapitan_DontCallThis();
|
| }
|
|
|
| CFAllocatorContext* ContextForCFAllocator(CFAllocatorRef allocator) {
|
| @@ -258,7 +258,8 @@ CFAllocatorContext* ContextForCFAllocator(CFAllocatorRef allocator) {
|
| } else if (base::mac::IsOSLion() ||
|
| base::mac::IsOSMountainLion() ||
|
| base::mac::IsOSMavericks() ||
|
| - base::mac::IsOSYosemite()) {
|
| + base::mac::IsOSYosemite() ||
|
| + base::mac::IsOSElCapitan()) {
|
| ChromeCFAllocatorLions* our_allocator =
|
| const_cast<ChromeCFAllocatorLions*>(
|
| reinterpret_cast<const ChromeCFAllocatorLions*>(allocator));
|
|
|