Follow up change to fix some leftovers in DiscardableMemory

BUG=19597


Review URL: https://chromiumcodereview.appspot.com/12045025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178213 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 12 insertions, 9 deletions

diff --git a/base/memory/discardable_memory.h b/base/memory/discardable_memory.h
index 3cccb57..3b63894 100644
--- a/base/memory/discardable_memory.h
+++ b/base/memory/discardable_memory.h
@@ -12,9 +12,9 @@
 namespace base {
 
 enum LockDiscardableMemoryStatus {
-  FAILED = -1,
-  PURGED = 0,
-  SUCCESS = 1
+  DISCARDABLE_MEMORY_FAILED = -1,
+  DISCARDABLE_MEMORY_PURGED = 0,
+  DISCARDABLE_MEMORY_SUCCESS = 1
 };
 
 // Platform abstraction for discardable memory. The DiscardableMemory should
@@ -57,8 +57,11 @@ class BASE_EXPORT DiscardableMemory {
   bool InitializeAndLock(size_t size);
 
   // Lock the memory so that it will not be purged by the system. Returns
-  // SUCCESS on success. Returns FAILED on error or PURGED if the memory is
-  // purged. Don't call this function in a nested fashion.
+  // DISCARDABLE_MEMORY_SUCCESS on success. If the return value is
+  // DISCARDABLE_MEMORY_FAILED then this object should be discarded and
+  // a new one should be created. If the return value is
+  // DISCARDABLE_MEMORY_PURGED then the memory is present but any data that
+  // was in it is gone.
   LockDiscardableMemoryStatus Lock() WARN_UNUSED_RESULT;
 
   // Unlock the memory so that it can be purged by the system. Must be called
diff --git a/base/memory/discardable_memory_android.cc b/base/memory/discardable_memory_android.cc
index afc2a2c..37691b8d 100644
--- a/base/memory/discardable_memory_android.cc
+++ b/base/memory/discardable_memory_android.cc
@@ -66,10 +66,10 @@ LockDiscardableMemoryStatus DiscardableMemory::Lock() {
     purged = true;
 
   if (!Map())
-    return FAILED;
+    return DISCARDABLE_MEMORY_FAILED;
 
   is_pinned_ = true;
-  return purged ? PURGED : SUCCESS;
+  return purged ? DISCARDABLE_MEMORY_PURGED : DISCARDABLE_MEMORY_SUCCESS;
 }
 
 void DiscardableMemory::Unlock() {
@@ -112,4 +112,4 @@ void DiscardableMemory::Unmap() {
   memory_ = NULL;
 }
 
-}  // namespace skia
+}  // namespace base
diff --git a/base/memory/discardable_memory_unittest.cc b/base/memory/discardable_memory_unittest.cc
index 66fdf0b..99888e6 100644
--- a/base/memory/discardable_memory_unittest.cc
+++ b/base/memory/discardable_memory_unittest.cc
@@ -24,7 +24,7 @@ TEST(DiscardableMemoryTest, LockAndUnLock) {
   ASSERT_NE(static_cast<void*>(NULL), addr);
 
   memory.Unlock();
-  EXPECT_EQ(SUCCESS, memory.Lock());
+  EXPECT_EQ(DISCARDABLE_MEMORY_SUCCESS, memory.Lock());
   addr = memory.Memory();
   ASSERT_NE(static_cast<void*>(NULL), addr);