Index: base/memory/discardable_memory_unittest.cc |
diff --git a/base/memory/discardable_memory_unittest.cc b/base/memory/discardable_memory_unittest.cc |
index d4c295565508171dc471fbf07df535609523275e..32e89b58dab3b11e683f5ac12537d4337381ef52 100644 |
--- a/base/memory/discardable_memory_unittest.cc |
+++ b/base/memory/discardable_memory_unittest.cc |
@@ -6,6 +6,7 @@ |
#include <algorithm> |
+#include "base/logging.h" |
#include "base/run_loop.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -28,6 +29,10 @@ class DiscardableMemoryTest |
} |
protected: |
+ DiscardableMemoryType GetCurrentDiscardableMemoryType() const { |
+ return GetParam(); |
+ } |
+ |
scoped_ptr<DiscardableMemory> CreateLockedMemory(size_t size) { |
return DiscardableMemory::CreateLockedMemoryWithType( |
GetParam(), size).Pass(); |
@@ -47,7 +52,7 @@ TEST_P(DiscardableMemoryTest, IsNamed) { |
bool IsNativeType(DiscardableMemoryType type) { |
return |
- type == DISCARDABLE_MEMORY_TYPE_ANDROID || |
+ type == DISCARDABLE_MEMORY_TYPE_ASHMEM || |
type == DISCARDABLE_MEMORY_TYPE_MAC; |
} |
@@ -91,19 +96,21 @@ TEST_P(DiscardableMemoryTest, DeleteWhileLocked) { |
ASSERT_TRUE(memory); |
} |
-#if !defined(OS_ANDROID) |
// Test forced purging. |
TEST_P(DiscardableMemoryTest, Purge) { |
- ASSERT_TRUE(DiscardableMemory::PurgeForTestingSupported()); |
+ if (!DiscardableMemory::PurgeForTestingSupported( |
+ GetCurrentDiscardableMemoryType())) { |
+ NOTIMPLEMENTED(); |
+ return; |
+ } |
const scoped_ptr<DiscardableMemory> memory(CreateLockedMemory(kSize)); |
ASSERT_TRUE(memory); |
memory->Unlock(); |
- DiscardableMemory::PurgeForTesting(); |
+ DiscardableMemory::PurgeForTesting(GetCurrentDiscardableMemoryType()); |
EXPECT_EQ(DISCARDABLE_MEMORY_LOCK_STATUS_PURGED, memory->Lock()); |
} |
-#endif // !OS_ANDROID |
#if !defined(NDEBUG) && !defined(OS_ANDROID) |
// Death tests are not supported with Android APKs. |