Add a size parameter to SharedMemoryHandle.

base/memory/shared_memory_unittest.cc

 // Copyright (c) 2012 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/memory/shared_memory.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 317 matching lines @@
   // The Mach functionality is tested in shared_memory_mac_unittest.cc.
   options.type = SharedMemoryHandle::POSIX;
 #endif
   ASSERT_TRUE(writable_shmem.Create(options));
   ASSERT_TRUE(writable_shmem.Map(options.size));
   memcpy(writable_shmem.memory(), contents.data(), contents.size());
   EXPECT_TRUE(writable_shmem.Unmap());
 
   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);
 
   ASSERT_TRUE(readonly_shmem.Map(contents.size()));
   EXPECT_EQ(contents,
             StringPiece(static_cast<const char*>(readonly_shmem.memory()),
                         contents.size()));
   EXPECT_TRUE(readonly_shmem.Unmap());
 
   // Make sure the writable instance is still writable.
@@ skipping 59 matching lines @@
 TEST(SharedMemoryTest, ShareToSelf) {
   StringPiece contents = "Hello World";
 
   SharedMemory shmem;
   ASSERT_TRUE(shmem.CreateAndMapAnonymous(contents.size()));
   memcpy(shmem.memory(), contents.data(), contents.size());
   EXPECT_TRUE(shmem.Unmap());
 
   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()));
   EXPECT_EQ(
       contents,
       StringPiece(static_cast<const char*>(shared.memory()), contents.size()));
 
   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()));
   EXPECT_EQ(contents,
             StringPiece(static_cast<const char*>(readonly.memory()),
                         contents.size()));
 }
 
 TEST(SharedMemoryTest, MapAt) {
   ASSERT_TRUE(SysInfo::VMAllocationGranularity() >= sizeof(uint32_t));
@@ skipping 158 matching lines @@
                            PAGE_READONLY | SEC_IMAGE, 0, 0, kTestSectionName));
   EXPECT_TRUE(section_handle.IsValid());
 
   // Check direct opening by name, from handle and duplicated from handle.
   SharedMemory shared_memory_open;
   EXPECT_TRUE(shared_memory_open.Open(kTestSectionName, true));
   EXPECT_FALSE(shared_memory_open.Map(1));
   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());
 
   // Check that a handle without SECTION_QUERY also can't be mapped as it can't
   // be checked.
   SharedMemory shared_memory_handle_dummy;
   SharedMemoryCreateOptions options;
   options.size = 0x1000;
   EXPECT_TRUE(shared_memory_handle_dummy.Create(options));
   HANDLE handle_no_query;
   EXPECT_TRUE(::DuplicateHandle(
       ::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());
 }
 #endif  // defined(OS_WIN)
 
 // iOS does not allow multiple processes.
 // Android ashmem does not support named shared memory.
 // Mac SharedMemory does not support named shared memory. crbug.com/345734
 #if !defined(OS_IOS) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
 // On POSIX it is especially important we test shmem across processes,
@@ skipping 66 matching lines @@
   memory.Close();
   SharedMemoryProcessTest::CleanUp();
 }
 
 MULTIPROCESS_TEST_MAIN(SharedMemoryTestMain) {
   return SharedMemoryProcessTest::TaskTestMain();
 }
 #endif  // !defined(OS_IOS) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
 
 }  // namespace base