| Index: base/memory/discardable_shared_memory_unittest.cc
|
| diff --git a/base/memory/discardable_shared_memory_unittest.cc b/base/memory/discardable_shared_memory_unittest.cc
|
| index d5b71d31cb0b9649087bea036d3ecf6e8cc40a21..91b0b68523aed4d24a5425ea0f96fdb6cf96c04b 100644
|
| --- a/base/memory/discardable_shared_memory_unittest.cc
|
| +++ b/base/memory/discardable_shared_memory_unittest.cc
|
| @@ -33,7 +33,6 @@
|
| bool rv = memory.CreateAndMap(kDataSize);
|
| ASSERT_TRUE(rv);
|
| EXPECT_GE(memory.mapped_size(), kDataSize);
|
| - EXPECT_TRUE(memory.IsMemoryLocked());
|
| }
|
|
|
| TEST(DiscardableSharedMemoryTest, CreateFromHandle) {
|
| @@ -51,7 +50,6 @@
|
| TestDiscardableSharedMemory memory2(shared_handle);
|
| rv = memory2.Map(kDataSize);
|
| ASSERT_TRUE(rv);
|
| - EXPECT_TRUE(memory2.IsMemoryLocked());
|
| }
|
|
|
| TEST(DiscardableSharedMemoryTest, LockAndUnlock) {
|
| @@ -64,7 +62,6 @@
|
| // Memory is initially locked. Unlock it.
|
| memory1.SetNow(Time::FromDoubleT(1));
|
| memory1.Unlock(0, 0);
|
| - EXPECT_FALSE(memory1.IsMemoryLocked());
|
|
|
| // Lock and unlock memory.
|
| auto lock_rv = memory1.Lock(0, 0);
|
| @@ -75,7 +72,6 @@
|
| // Lock again before duplicating and passing ownership to new instance.
|
| lock_rv = memory1.Lock(0, 0);
|
| EXPECT_EQ(DiscardableSharedMemory::SUCCESS, lock_rv);
|
| - EXPECT_TRUE(memory1.IsMemoryLocked());
|
|
|
| SharedMemoryHandle shared_handle;
|
| ASSERT_TRUE(
|
| @@ -90,18 +86,13 @@
|
| memory2.SetNow(Time::FromDoubleT(3));
|
| memory2.Unlock(0, 0);
|
|
|
| - // Both memory instances should be unlocked now.
|
| - EXPECT_FALSE(memory2.IsMemoryLocked());
|
| - EXPECT_FALSE(memory1.IsMemoryLocked());
|
| -
|
| // Lock second instance before passing ownership back to first instance.
|
| lock_rv = memory2.Lock(0, 0);
|
| EXPECT_EQ(DiscardableSharedMemory::SUCCESS, lock_rv);
|
|
|
| - // Memory should still be resident and locked.
|
| + // Memory should still be resident.
|
| rv = memory1.IsMemoryResident();
|
| EXPECT_TRUE(rv);
|
| - EXPECT_TRUE(memory1.IsMemoryLocked());
|
|
|
| // Unlock first instance.
|
| memory1.SetNow(Time::FromDoubleT(4));
|
|
|