Index: trunk/src/base/memory/discardable_memory_mac.cc |
=================================================================== |
--- trunk/src/base/memory/discardable_memory_mac.cc (revision 267174) |
+++ trunk/src/base/memory/discardable_memory_mac.cc (working copy) |
@@ -115,7 +115,7 @@ |
DiscardableMemoryType type, size_t size) { |
switch (type) { |
case DISCARDABLE_MEMORY_TYPE_NONE: |
- case DISCARDABLE_MEMORY_TYPE_ASHMEM: |
+ case DISCARDABLE_MEMORY_TYPE_ANDROID: |
return scoped_ptr<DiscardableMemory>(); |
case DISCARDABLE_MEMORY_TYPE_MAC: { |
scoped_ptr<DiscardableMemoryMac> memory(new DiscardableMemoryMac(size)); |
@@ -147,6 +147,11 @@ |
} |
// static |
+bool DiscardableMemory::PurgeForTestingSupported() { |
+ return true; |
+} |
+ |
+// static |
void DiscardableMemory::PurgeForTesting() { |
int state = 0; |
vm_purgable_control(mach_task_self(), 0, VM_PURGABLE_PURGE_ALL, &state); |