Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Unified Diff: base/memory/shared_memory_unittest.cc

Issue 2875453002: Add a size parameter to SharedMemoryHandle. (Closed)
Patch Set: Remove extraneous period. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/memory/shared_memory_posix.cc ('k') | base/memory/shared_memory_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/memory/shared_memory_unittest.cc
diff --git a/base/memory/shared_memory_unittest.cc b/base/memory/shared_memory_unittest.cc
index 98698ecfb31208bb7cc48317401e9c315c8e021c..9c3b3c49ae84fc3e920bb798d875d8f5946b6250 100644
--- a/base/memory/shared_memory_unittest.cc
+++ b/base/memory/shared_memory_unittest.cc
@@ -335,6 +335,7 @@ TEST(SharedMemoryTest, GetReadOnlyHandle) {
SharedMemoryHandle readonly_handle = writable_shmem.GetReadOnlyHandle();
EXPECT_EQ(writable_shmem.handle().GetGUID(), readonly_handle.GetGUID());
+ EXPECT_EQ(writable_shmem.handle().GetSize(), readonly_handle.GetSize());
ASSERT_TRUE(readonly_handle.IsValid());
SharedMemory readonly_shmem(readonly_handle, /*readonly=*/true);
@@ -414,9 +415,9 @@ TEST(SharedMemoryTest, ShareToSelf) {
SharedMemoryHandle shared_handle = shmem.handle().Duplicate();
ASSERT_TRUE(shared_handle.IsValid());
-#if defined(OS_WIN)
- ASSERT_TRUE(shared_handle.OwnershipPassesToIPC());
-#endif
+ EXPECT_TRUE(shared_handle.OwnershipPassesToIPC());
+ EXPECT_EQ(shared_handle.GetGUID(), shmem.handle().GetGUID());
+ EXPECT_EQ(shared_handle.GetSize(), shmem.handle().GetSize());
SharedMemory shared(shared_handle, /*readonly=*/false);
ASSERT_TRUE(shared.Map(contents.size()));
@@ -426,9 +427,7 @@ TEST(SharedMemoryTest, ShareToSelf) {
shared_handle = shmem.handle().Duplicate();
ASSERT_TRUE(shared_handle.IsValid());
-#if defined(OS_WIN)
ASSERT_TRUE(shared_handle.OwnershipPassesToIPC());
-#endif
SharedMemory readonly(shared_handle, /*readonly=*/true);
ASSERT_TRUE(readonly.Map(contents.size()));
@@ -607,7 +606,7 @@ TEST(SharedMemoryTest, UnsafeImageSection) {
EXPECT_EQ(nullptr, shared_memory_open.memory());
SharedMemory shared_memory_handle_local(
- SharedMemoryHandle(section_handle.Take(), UnguessableToken::Create()),
+ SharedMemoryHandle(section_handle.Take(), 1, UnguessableToken::Create()),
true);
EXPECT_FALSE(shared_memory_handle_local.Map(1));
EXPECT_EQ(nullptr, shared_memory_handle_local.memory());
@@ -623,7 +622,9 @@ TEST(SharedMemoryTest, UnsafeImageSection) {
::GetCurrentProcess(), shared_memory_handle_dummy.handle().GetHandle(),
::GetCurrentProcess(), &handle_no_query, FILE_MAP_READ, FALSE, 0));
SharedMemory shared_memory_handle_no_query(
- SharedMemoryHandle(handle_no_query, UnguessableToken::Create()), true);
+ SharedMemoryHandle(handle_no_query, options.size,
+ UnguessableToken::Create()),
+ true);
EXPECT_FALSE(shared_memory_handle_no_query.Map(1));
EXPECT_EQ(nullptr, shared_memory_handle_no_query.memory());
}
« no previous file with comments | « base/memory/shared_memory_posix.cc ('k') | base/memory/shared_memory_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698