Changing multiprocess test SpawnChild to return a struct.

base/memory/shared_memory_mac_unittest.cc

 // Copyright 2015 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 <mach/mach.h>
 #include <mach/mach_vm.h>
 #include <servers/bootstrap.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 186 matching lines @@
     // Pass the service name to the child process.
     command_line.AppendSwitchASCII(g_service_switch_name, service_name_);
     return command_line;
   }
 
   void SetUpChild(const std::string& name) {
     // Make a random service name so that this test doesn't conflict with other
     // similar tests.
     service_name_ = CreateRandomServiceName();
     server_port_.reset(BecomeMachServer(service_name_.c_str()));
-    child_process_ = SpawnChild(name);
+    spawn_child_ = SpawnChild(name);
     client_port_.reset(ReceiveMachPort(server_port_.get()));
   }
 
   static const int s_memory_size = 99999;
 
  protected:
   std::string service_name_;
 
   // A port on which the main process listens for mach messages from the child
   // process.
   mac::ScopedMachReceiveRight server_port_;
 
   // A port on which the child process listens for mach messages from the main
   // process.
   mac::ScopedMachSendRight client_port_;
 
-  base::Process child_process_;
+  base::SpawnChildResult spawn_child_;
   DISALLOW_COPY_AND_ASSIGN(SharedMemoryMacMultiProcessTest);
 };
 
 // Tests that content written to shared memory in the server process can be read
 // by the child process.
 TEST_F(SharedMemoryMacMultiProcessTest, MachBasedSharedMemory) {
   SetUpChild("MachBasedSharedMemoryClient");
 
   std::unique_ptr<SharedMemory> shared_memory(
       CreateSharedMemory(s_memory_size));
 
   // Send the underlying memory object to the client process.
   SendMachPort(client_port_.get(), shared_memory->handle().GetMemoryObject(),
                MACH_MSG_TYPE_COPY_SEND);
   int rv = -1;
-  ASSERT_TRUE(child_process_.WaitForExitWithTimeout(
+  ASSERT_TRUE(spawn_child_.process.WaitForExitWithTimeout(
       TestTimeouts::action_timeout(), &rv));
   EXPECT_EQ(0, rv);
 }
 
 MULTIPROCESS_TEST_MAIN(MachBasedSharedMemoryClient) {
   mac::ScopedMachReceiveRight client_port(CommonChildProcessSetUp());
   // The next mach port should be for a memory object.
   mach_port_t memory_object = ReceiveMachPort(client_port.get());
   SharedMemoryHandle shm(memory_object,
                          SharedMemoryMacMultiProcessTest::s_memory_size,
@@ skipping 19 matching lines @@
   size_t page_size = SysInfo::VMAllocationGranularity();
   char* start = static_cast<char*>(shared_memory.memory());
   memset(start, 'a', page_size);
   memset(start + page_size, 'b', page_size);
   memset(start + 2 * page_size, 'c', page_size);
 
   // Send the underlying memory object to the client process.
   SendMachPort(
       client_port_.get(), shm.GetMemoryObject(), MACH_MSG_TYPE_COPY_SEND);
   int rv = -1;
-  ASSERT_TRUE(child_process_.WaitForExitWithTimeout(
+  ASSERT_TRUE(spawn_child_.process.WaitForExitWithTimeout(
       TestTimeouts::action_timeout(), &rv));
   EXPECT_EQ(0, rv);
 }
 
 MULTIPROCESS_TEST_MAIN(MachBasedSharedMemoryWithOffsetClient) {
   mac::ScopedMachReceiveRight client_port(CommonChildProcessSetUp());
   // The next mach port should be for a memory object.
   mach_port_t memory_object = ReceiveMachPort(client_port.get());
   SharedMemoryHandle shm(memory_object,
                          SharedMemoryMacMultiProcessTest::s_memory_size,
@@ skipping 159 matching lines @@
 
     // Intentionally map with |readonly| set to |false|.
     SharedMemory shared_memory2(shm2, false);
     shared_memory2.Map(s_memory_size);
   }
 
   EXPECT_EQ(active_name_count, GetActiveNameCount());
 }
 
 }  //  namespace base