Chromium Code Reviews| Index: base/memory/discardable_memory_unittest.cc |
| diff --git a/base/memory/discardable_memory_unittest.cc b/base/memory/discardable_memory_unittest.cc |
| index 60d35820fbd489a2fea3c9d9af70eb6195a5df0a..05c76e74c3c23596d0a7ba20644c40da50b6de9f 100644 |
| --- a/base/memory/discardable_memory_unittest.cc |
| +++ b/base/memory/discardable_memory_unittest.cc |
| @@ -7,11 +7,18 @@ |
| namespace base { |
| -#if defined(OS_ANDROID) || defined(OS_MACOSX) |
| +TEST(DiscardableMemoryTest, SupportedNatively) { |
| +// In future, if support is conditional on a runtime check, we'll need another |
| +// case here. |
|
Avi (use Gerrit)
2013/06/20 21:16:41
... especially here; the idea that the #define wou
|
| +#if defined(DISCARDABLE_MEMORY_SUPPORTED_NATIVELY) |
| + ASSERT_TRUE(DiscardableMemory::SupportedNatively()); |
| +#else |
| + ASSERT_FALSE(DiscardableMemory::SupportedNatively()); |
| +#endif |
| +} |
| + |
| // Test Lock() and Unlock() functionalities. |
| TEST(DiscardableMemoryTest, LockAndUnLock) { |
| - ASSERT_TRUE(DiscardableMemory::Supported()); |
| - |
| const size_t size = 1024; |
| DiscardableMemory memory; |
| @@ -31,18 +38,15 @@ TEST(DiscardableMemoryTest, LockAndUnLock) { |
| // Test delete a discardable memory while it is locked. |
| TEST(DiscardableMemoryTest, DeleteWhileLocked) { |
| - ASSERT_TRUE(DiscardableMemory::Supported()); |
| - |
| const size_t size = 1024; |
| DiscardableMemory memory; |
| ASSERT_TRUE(memory.InitializeAndLock(size)); |
| } |
| -#if defined(OS_MACOSX) |
| +#if !defined(OS_ANDROID) |
| // Test forced purging. |
| TEST(DiscardableMemoryTest, Purge) { |
| - ASSERT_TRUE(DiscardableMemory::Supported()); |
| ASSERT_TRUE(DiscardableMemory::PurgeForTestingSupported()); |
| const size_t size = 1024; |
| @@ -54,8 +58,6 @@ TEST(DiscardableMemoryTest, Purge) { |
| DiscardableMemory::PurgeForTesting(); |
| EXPECT_EQ(DISCARDABLE_MEMORY_PURGED, memory.Lock()); |
| } |
| -#endif // OS_MACOSX |
| - |
| -#endif // OS_* |
| +#endif // !OS_ANDROID |
| } |