Change MessagePumpForGpu and SharedMemory to ScopedHandle

base/metrics/persistent_memory_allocator_unittest.cc

Index: base/metrics/persistent_memory_allocator_unittest.cc
diff --git a/base/metrics/persistent_memory_allocator_unittest.cc b/base/metrics/persistent_memory_allocator_unittest.cc
index b8f37078db9269b973e7110c7331b9f80df04fa0..f9a90b26b631a64f545ac5f7c222dbcd5f9eec77 100644
--- a/base/metrics/persistent_memory_allocator_unittest.cc
+++ b/base/metrics/persistent_memory_allocator_unittest.cc
@@ -497,7 +497,8 @@ TEST(LocalPersistentMemoryAllocatorTest, CreationTest) {
 //----- SharedPersistentMemoryAllocator ----------------------------------------
 
 TEST(SharedPersistentMemoryAllocatorTest, CreationTest) {
-  SharedMemoryHandle shared_handle;
+  SharedMemoryHandle shared_handle_1;
+  SharedMemoryHandle shared_handle_2;
 
   PersistentMemoryAllocator::MemoryInfo meminfo1;
   Reference r123, r456, r789;
@@ -519,11 +520,14 @@ TEST(SharedPersistentMemoryAllocatorTest, CreationTest) {
 
     ASSERT_TRUE(local.shared_memory()->ShareToProcess(
                     GetCurrentProcessHandle(),
-                    &shared_handle));
+                    &shared_handle_1));
+    ASSERT_TRUE(local.shared_memory()->ShareToProcess(
+                    GetCurrentProcessHandle(),
+                    &shared_handle_2));
   }
 
   // Read-only test.
-  std::unique_ptr<SharedMemory> shmem2(new SharedMemory(shared_handle,
+  std::unique_ptr<SharedMemory> shmem2(new SharedMemory(shared_handle_1,
                                                         /*readonly=*/true));
   ASSERT_TRUE(shmem2->Map(TEST_MEMORY_SIZE));
 
@@ -549,7 +553,7 @@ TEST(SharedPersistentMemoryAllocatorTest, CreationTest) {
   EXPECT_EQ(meminfo1.free, meminfo2.free);
 
   // Read/write test.
-  std::unique_ptr<SharedMemory> shmem3(new SharedMemory(shared_handle,
+  std::unique_ptr<SharedMemory> shmem3(new SharedMemory(shared_handle_2,

[stanisc, 2016/06/29 18:36:18]

Changed this to avoid double tracking of the same handle.

                                                         /*readonly=*/false));
   ASSERT_TRUE(shmem3->Map(TEST_MEMORY_SIZE));