Use DiscardableMemoryManager on Android.

base/memory/discardable_memory_mac.cc

 // Copyright (c) 2013 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.
 
 #include "base/memory/discardable_memory.h"
 
 #include <mach/mach.h>
 #include <sys/mman.h>
 
 #include "base/basictypes.h"
@@ skipping 97 matching lines @@
     DISCARDABLE_MEMORY_TYPE_MALLOC
   };
   types->assign(supported_types, supported_types + arraysize(supported_types));
 }
 
 // static
 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));
       if (!memory->Initialize())
         return scoped_ptr<DiscardableMemory>();
 
       return memory.PassAs<DiscardableMemory>();
     }
     case DISCARDABLE_MEMORY_TYPE_EMULATED: {
       scoped_ptr<internal::DiscardableMemoryEmulated> memory(
@@ skipping 11 matching lines @@
 
       return memory.PassAs<DiscardableMemory>();
     }
   }
 
   NOTREACHED();
   return scoped_ptr<DiscardableMemory>();
 }
 
 // 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