Refactor DiscardableMemory for the upcoming DiscardableMemoryAllocator.

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..0b36736e48996ed8a20a235eac2b68f951e41149 100644
--- a/base/memory/discardable_memory_unittest.cc
+++ b/base/memory/discardable_memory_unittest.cc
@@ -7,36 +7,36 @@
 
 namespace base {
 
+const size_t kSize = 1024;
+
 #if defined(OS_ANDROID) || defined(OS_MACOSX)
 // Test Lock() and Unlock() functionalities.
 TEST(DiscardableMemoryTest, LockAndUnLock) {
   ASSERT_TRUE(DiscardableMemory::Supported());
 
-  const size_t size = 1024;
-
-  DiscardableMemory memory;
-  ASSERT_TRUE(memory.InitializeAndLock(size));
-  void* addr = memory.Memory();
+  const scoped_ptr<DiscardableMemory> memory(
+      DiscardableMemory::CreateLockedMemory(kSize));
+  ASSERT_TRUE(memory);
+  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());
 
-  const size_t size = 1024;
-
-  DiscardableMemory memory;
-  ASSERT_TRUE(memory.InitializeAndLock(size));
+  const scoped_ptr<DiscardableMemory> memory(
+      DiscardableMemory::CreateLockedMemory(kSize));
+  ASSERT_TRUE(memory);
 }
 
 #if defined(OS_MACOSX)
@@ -45,14 +45,13 @@ TEST(DiscardableMemoryTest, Purge) {
   ASSERT_TRUE(DiscardableMemory::Supported());
   ASSERT_TRUE(DiscardableMemory::PurgeForTestingSupported());
 
-  const size_t size = 1024;
-
-  DiscardableMemory memory;
-  ASSERT_TRUE(memory.InitializeAndLock(size));
-  memory.Unlock();
+  const scoped_ptr<DiscardableMemory> memory(
+      DiscardableMemory::CreateLockedMemory(kSize));
+  ASSERT_TRUE(memory);
+  memory->Unlock();
 
   DiscardableMemory::PurgeForTesting();
-  EXPECT_EQ(DISCARDABLE_MEMORY_PURGED, memory.Lock());
+  EXPECT_EQ(DISCARDABLE_MEMORY_PURGED, memory->Lock());
 }
 #endif  // OS_MACOSX