Index: base/memory/discardable_memory_android.cc |
diff --git a/base/memory/discardable_memory_android.cc b/base/memory/discardable_memory_android.cc |
index 9e589e2f4003520c1d9afcefbbd3c5e1130c945c..7dd8df71dc736d9e5dd5f3d5f9732d34b6020fea 100644 |
--- a/base/memory/discardable_memory_android.cc |
+++ b/base/memory/discardable_memory_android.cc |
@@ -11,7 +11,6 @@ |
#include "base/memory/discardable_memory_ashmem.h" |
#include "base/memory/discardable_memory_ashmem_allocator.h" |
#include "base/memory/discardable_memory_emulated.h" |
-#include "base/memory/discardable_memory_malloc.h" |
#include "base/sys_info.h" |
namespace base { |
@@ -53,8 +52,7 @@ void DiscardableMemory::GetSupportedTypes( |
std::vector<DiscardableMemoryType>* types) { |
const DiscardableMemoryType supported_types[] = { |
DISCARDABLE_MEMORY_TYPE_ASHMEM, |
- DISCARDABLE_MEMORY_TYPE_EMULATED, |
- DISCARDABLE_MEMORY_TYPE_MALLOC |
+ DISCARDABLE_MEMORY_TYPE_EMULATED |
}; |
types->assign(supported_types, supported_types + arraysize(supported_types)); |
} |
@@ -81,14 +79,6 @@ scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemoryWithType( |
return memory.PassAs<DiscardableMemory>(); |
} |
- case DISCARDABLE_MEMORY_TYPE_MALLOC: { |
- scoped_ptr<internal::DiscardableMemoryMalloc> memory( |
- new internal::DiscardableMemoryMalloc(size)); |
- if (!memory->Initialize()) |
- return scoped_ptr<DiscardableMemory>(); |
- |
- return memory.PassAs<DiscardableMemory>(); |
- } |
case DISCARDABLE_MEMORY_TYPE_NONE: |
case DISCARDABLE_MEMORY_TYPE_MAC: |
NOTREACHED(); |