base: Improve DiscardableSharedMemory support for ashmem.

base/memory/discardable_shared_memory_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/memory/discardable_shared_memory.h"
 #include "base/process/process_metrics.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
@@ skipping 46 matching lines @@
 
   TestDiscardableSharedMemory memory1;
   bool rv = memory1.CreateAndMap(kDataSize);
   ASSERT_TRUE(rv);
 
   // Memory is initially locked. Unlock it.
   memory1.SetNow(Time::FromDoubleT(1));
   memory1.Unlock(0, 0);
 
   // Lock and unlock memory.
-  rv = memory1.Lock(0, 0);
-  EXPECT_TRUE(rv);
+  auto lock_rv = memory1.Lock(0, 0);
+  EXPECT_EQ(DiscardableSharedMemory::SUCCESS, lock_rv);
   memory1.SetNow(Time::FromDoubleT(2));
   memory1.Unlock(0, 0);
 
   // Lock again before duplicating and passing ownership to new instance.
-  rv = memory1.Lock(0, 0);
-  EXPECT_TRUE(rv);
+  lock_rv = memory1.Lock(0, 0);
+  EXPECT_EQ(DiscardableSharedMemory::SUCCESS, lock_rv);
 
   SharedMemoryHandle shared_handle;
   ASSERT_TRUE(
       memory1.ShareToProcess(GetCurrentProcessHandle(), &shared_handle));
   ASSERT_TRUE(SharedMemory::IsHandleValid(shared_handle));
 
   TestDiscardableSharedMemory memory2(shared_handle);
   rv = memory2.Map(kDataSize);
   ASSERT_TRUE(rv);
 
   // Unlock second instance.
   memory2.SetNow(Time::FromDoubleT(3));
   memory2.Unlock(0, 0);
 
   // Lock second instance before passing ownership back to first instance.
-  rv = memory2.Lock(0, 0);
-  EXPECT_TRUE(rv);
+  lock_rv = memory2.Lock(0, 0);
+  EXPECT_EQ(DiscardableSharedMemory::SUCCESS, lock_rv);
 
   // Memory should still be resident.
   rv = memory1.IsMemoryResident();
   EXPECT_TRUE(rv);
 
   // Unlock first instance.
   memory1.SetNow(Time::FromDoubleT(4));
   memory1.Unlock(0, 0);
 }
 
@@ skipping 26 matching lines @@
   rv = memory1.Purge(Time::FromDoubleT(3));
   EXPECT_FALSE(rv);
 
   ASSERT_TRUE(memory2.IsMemoryResident());
 
   // Memory is unlocked and our usage timestamp should be correct.
   rv = memory1.Purge(Time::FromDoubleT(4));
   EXPECT_TRUE(rv);
 
   // Lock should fail as memory has been purged.
-  rv = memory2.Lock(0, 0);
-  EXPECT_FALSE(rv);
+  auto lock_rv = memory2.Lock(0, 0);
+  EXPECT_EQ(DiscardableSharedMemory::FAILED, lock_rv);
 
   ASSERT_FALSE(memory2.IsMemoryResident());
 }
 
 TEST(DiscardableSharedMemoryTest, LastUsed) {
   const uint32 kDataSize = 1024;
 
   TestDiscardableSharedMemory memory1;
   bool rv = memory1.CreateAndMap(kDataSize);
   ASSERT_TRUE(rv);
 
   SharedMemoryHandle shared_handle;
   ASSERT_TRUE(
       memory1.ShareToProcess(GetCurrentProcessHandle(), &shared_handle));
   ASSERT_TRUE(SharedMemory::IsHandleValid(shared_handle));
 
   TestDiscardableSharedMemory memory2(shared_handle);
   rv = memory2.Map(kDataSize);
   ASSERT_TRUE(rv);
 
   memory2.SetNow(Time::FromDoubleT(1));
   memory2.Unlock(0, 0);
 
   EXPECT_EQ(memory2.last_known_usage(), Time::FromDoubleT(1));
 
-  rv = memory2.Lock(0, 0);
-  EXPECT_TRUE(rv);
+  auto lock_rv = memory2.Lock(0, 0);
+  EXPECT_EQ(DiscardableSharedMemory::SUCCESS, lock_rv);
 
   // This should fail as memory is locked.
   rv = memory1.Purge(Time::FromDoubleT(2));
   ASSERT_FALSE(rv);
 
   // Last usage should have been updated to timestamp passed to Purge above.
   EXPECT_EQ(memory1.last_known_usage(), Time::FromDoubleT(2));
 
   memory2.SetNow(Time::FromDoubleT(3));
   memory2.Unlock(0, 0);
@@ skipping 48 matching lines @@
   rv = memory2.Map(kDataSize);
   ASSERT_TRUE(rv);
 
   memory2.SetNow(Time::FromDoubleT(1));
   memory2.Unlock(0, 0);
 
   rv = memory2.Purge(Time::FromDoubleT(2));
   EXPECT_TRUE(rv);
 
   // Lock should fail as memory has been purged.
-  rv = memory2.Lock(0, 0);
-  EXPECT_FALSE(rv);
-  rv = memory1.Lock(0, 0);
-  EXPECT_FALSE(rv);
+  auto lock_rv = memory2.Lock(0, 0);
+  EXPECT_EQ(DiscardableSharedMemory::FAILED, lock_rv);
+  lock_rv = memory1.Lock(0, 0);
+  EXPECT_EQ(DiscardableSharedMemory::FAILED, lock_rv);
 }
 
 TEST(DiscardableSharedMemoryTest, LockAndUnlockRange) {
   const uint32 kDataSize = 32;
 
   uint32 data_size_in_bytes = kDataSize * base::GetPageSize();
 
   TestDiscardableSharedMemory memory1;
   bool rv = memory1.CreateAndMap(data_size_in_bytes);
   ASSERT_TRUE(rv);
@@ skipping 47 matching lines @@
 
   EXPECT_LE(kDataSize, memory.mapped_size());
 
   // Mapped size should be 0 after memory segment has been closed.
   memory.Close();
   EXPECT_EQ(0u, memory.mapped_size());
 }
 
 }  // namespace
 }  // namespace base