Index: base/memory/discardable_memory_unittest.cc |
diff --git a/base/memory/discardable_memory_unittest.cc b/base/memory/discardable_memory_unittest.cc |
index dc0e2cd21262b4d7da8dd3edb891b91bb8f2d5b7..d4c295565508171dc471fbf07df535609523275e 100644 |
--- a/base/memory/discardable_memory_unittest.cc |
+++ b/base/memory/discardable_memory_unittest.cc |
@@ -47,7 +47,7 @@ |
bool IsNativeType(DiscardableMemoryType type) { |
return |
- type == DISCARDABLE_MEMORY_TYPE_ASHMEM || |
+ type == DISCARDABLE_MEMORY_TYPE_ANDROID || |
type == DISCARDABLE_MEMORY_TYPE_MAC; |
} |
@@ -91,8 +91,11 @@ |
ASSERT_TRUE(memory); |
} |
+#if !defined(OS_ANDROID) |
// Test forced purging. |
TEST_P(DiscardableMemoryTest, Purge) { |
+ ASSERT_TRUE(DiscardableMemory::PurgeForTestingSupported()); |
+ |
const scoped_ptr<DiscardableMemory> memory(CreateLockedMemory(kSize)); |
ASSERT_TRUE(memory); |
memory->Unlock(); |
@@ -100,6 +103,7 @@ |
DiscardableMemory::PurgeForTesting(); |
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. |