Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / base / memory / discardable_memory_mac.cc

diff --git a/src/base/memory/discardable_memory_mac.cc b/src/base/memory/discardable_memory_mac.cc
index 40a9739..8cd5905 100644 (file)
--- a/src/base/memory/discardable_memory_mac.cc
+++ b/src/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,11 +147,6 @@ scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemoryWithType(
 }
 
 // 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);