Use DiscardableMemoryManager on Android.

base/memory/discardable_memory_mac.cc

Index: base/memory/discardable_memory_mac.cc
diff --git a/base/memory/discardable_memory_mac.cc b/base/memory/discardable_memory_mac.cc
index 40a97392e955e1a740171f82ffca6f9508fa3805..dc165167d0cb9c1f5ddd4f87832d1dae99c5806d 100644
--- a/base/memory/discardable_memory_mac.cc
+++ b/base/memory/discardable_memory_mac.cc
@@ -115,7 +115,7 @@ scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemoryWithType(
     DiscardableMemoryType type, size_t size) {
   switch (type) {
     case DISCARDABLE_MEMORY_TYPE_NONE:
-    case DISCARDABLE_MEMORY_TYPE_ANDROID:
+    case DISCARDABLE_MEMORY_TYPE_ASHMEM:
       return scoped_ptr<DiscardableMemory>();
     case DISCARDABLE_MEMORY_TYPE_MAC: {
       scoped_ptr<DiscardableMemoryMac> memory(new DiscardableMemoryMac(size));
@@ -147,15 +147,31 @@ scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemoryWithType(
 }
 
 // static
-bool DiscardableMemory::PurgeForTestingSupported() {
-  return true;
+bool DiscardableMemory::PurgeForTestingSupported(DiscardableMemoryType type) {
+  switch (type) {
+    case DISCARDABLE_MEMORY_TYPE_EMULATED:
+    case DISCARDABLE_MEMORY_TYPE_MAC:
+      return true;
+    default:
+      return false;
+  }
 }
 
 // static
-void DiscardableMemory::PurgeForTesting() {
-  int state = 0;
-  vm_purgable_control(mach_task_self(), 0, VM_PURGABLE_PURGE_ALL, &state);
-  internal::DiscardableMemoryEmulated::PurgeForTesting();
+void DiscardableMemory::PurgeForTesting(DiscardableMemoryType type) {
+  switch (type) {
+    case DISCARDABLE_MEMORY_TYPE_EMULATED:
+      internal::DiscardableMemoryEmulated::PurgeForTesting();
+      return;
+    case DISCARDABLE_MEMORY_TYPE_MAC: {
+      int state = 0;
+      vm_purgable_control(mach_task_self(), 0, VM_PURGABLE_PURGE_ALL, &state);
+      internal::DiscardableMemoryEmulated::PurgeForTesting();

[reveman, 2014/04/28 16:02:24]

if we add a type parameter then we shouldn't purge emulated type here.

[Philippe, 2014/04/28 16:31:22]

Yes, that was a mistake. I got rid of the type though.

+      return;
+    }
+    default:
+      NOTREACHED();
+  }
 }
 
 }  // namespace base