[Not for review] Discardable memory emulation

base/memory/discardable_memory_unittest.cc

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..5f05ff6937fe42ecfbabfc4bf3463b5e1adde187 100644
--- a/base/memory/discardable_memory_unittest.cc
+++ b/base/memory/discardable_memory_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/memory/discardable_memory.h"
+#include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
@@ -10,49 +11,53 @@ namespace base {
 #if defined(OS_ANDROID) || defined(OS_MACOSX)

[Avi (use Gerrit), 2013/06/07 14:46:53]

#if defined(DISCARDABLE_MEMORY_SUPPORTED_NATIVELY)

 // Test Lock() and Unlock() functionalities.
 TEST(DiscardableMemoryTest, LockAndUnLock) {
-  ASSERT_TRUE(DiscardableMemory::Supported());
+  ASSERT_TRUE(DiscardableMemoryProvider::GetInstance());
 
   const size_t size = 1024;
 
-  DiscardableMemory memory;
-  ASSERT_TRUE(memory.InitializeAndLock(size));
-  void* addr = memory.Memory();
+  scoped_ptr<DiscardableMemory> memory(
+      DiscardableMemoryProvider::GetInstance()->CreateDiscardableMemory());
+  ASSERT_TRUE(memory->InitializeAndLock(size));
+  void* addr = memory->Memory();
   ASSERT_NE(static_cast<void*>(NULL), addr);
 
-  memory.Unlock();
+  memory->Unlock();
   // The system should have no reason to purge discardable blocks in this brief
   // interval, though technically speaking this might flake.
-  EXPECT_EQ(DISCARDABLE_MEMORY_SUCCESS, memory.Lock());
-  addr = memory.Memory();
+  EXPECT_EQ(DISCARDABLE_MEMORY_SUCCESS, memory->Lock());
+  addr = memory->Memory();
   ASSERT_NE(static_cast<void*>(NULL), addr);
 
-  memory.Unlock();
+  memory->Unlock();
 }
 
 // Test delete a discardable memory while it is locked.
 TEST(DiscardableMemoryTest, DeleteWhileLocked) {
-  ASSERT_TRUE(DiscardableMemory::Supported());
+  ASSERT_TRUE(DiscardableMemoryProvider::GetInstance());
 
   const size_t size = 1024;
 
-  DiscardableMemory memory;
-  ASSERT_TRUE(memory.InitializeAndLock(size));
+  scoped_ptr<DiscardableMemory> memory(
+      DiscardableMemoryProvider::GetInstance()->CreateDiscardableMemory());
+  ASSERT_TRUE(memory->InitializeAndLock(size));
 }
 
 #if defined(OS_MACOSX)
 // Test forced purging.
 TEST(DiscardableMemoryTest, Purge) {
-  ASSERT_TRUE(DiscardableMemory::Supported());
-  ASSERT_TRUE(DiscardableMemory::PurgeForTestingSupported());
+  ASSERT_TRUE(DiscardableMemoryProvider::GetInstance());
+  ASSERT_TRUE(
+      DiscardableMemoryProvider::GetInstance()->PurgeForTestingSupported());
 
   const size_t size = 1024;
 
-  DiscardableMemory memory;
-  ASSERT_TRUE(memory.InitializeAndLock(size));
-  memory.Unlock();
+  scoped_ptr<DiscardableMemory> memory(
+      DiscardableMemoryProvider::GetInstance()->CreateDiscardableMemory());
+  ASSERT_TRUE(memory->InitializeAndLock(size));
+  memory->Unlock();
 
-  DiscardableMemory::PurgeForTesting();
-  EXPECT_EQ(DISCARDABLE_MEMORY_PURGED, memory.Lock());
+  DiscardableMemoryProvider::GetInstance()->PurgeForTesting();
+  EXPECT_EQ(DISCARDABLE_MEMORY_PURGED, memory->Lock());
 }
 #endif  // OS_MACOSX