Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Unified Diff: base/memory/discardable_memory_unittest.cc

Issue 17106004: Add discardable memory emulation for non-android/mac platforms (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..23818eb9d5c278f0fde06fde34485b44ad0e96ff 100644
--- a/base/memory/discardable_memory_unittest.cc
+++ b/base/memory/discardable_memory_unittest.cc
@@ -7,7 +7,6 @@
namespace base {
-#if defined(OS_ANDROID) || defined(OS_MACOSX)
// Test Lock() and Unlock() functionalities.
TEST(DiscardableMemoryTest, LockAndUnLock) {
ASSERT_TRUE(DiscardableMemory::Supported());
@@ -31,15 +30,13 @@ 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());
@@ -54,8 +51,6 @@ TEST(DiscardableMemoryTest, Purge) {
DiscardableMemory::PurgeForTesting();
EXPECT_EQ(DISCARDABLE_MEMORY_PURGED, memory.Lock());
}
-#endif // OS_MACOSX
-
-#endif // OS_*
+#endif // !OS_ANDROID
}

Powered by Google App Engine
This is Rietveld 408576698