Changing multiprocess test SpawnChild to return a struct.

sandbox/mac/xpc_message_server_unittest.cc

 // Copyright 2014 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 "sandbox/mac/xpc_message_server.h"
 
 #include <Block.h>
 #include <mach/mach.h>
 #include <servers/bootstrap.h>
 #include <stdint.h>
@@ skipping 129 matching lines @@
       child_pid = xpc_dictionary_get_int64(request.xpc, "child_pid");
   }));
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
   kern_return_t kr = bootstrap_register(bootstrap_port, kGetSenderPID,
       server->GetServerPort());
 #pragma GCC diagnostic pop
   ASSERT_EQ(KERN_SUCCESS, kr);
 
-  base::Process child = base::SpawnMultiProcessTestChild(
-      "GetSenderPID",
-      base::GetMultiProcessTestChildBaseCommandLine(),
+  base::SpawnChildResult spawn_child = base::SpawnMultiProcessTestChild(
+      "GetSenderPID", base::GetMultiProcessTestChildBaseCommandLine(),
       base::LaunchOptions());
-  ASSERT_TRUE(child.IsValid());
+  ASSERT_TRUE(spawn_child.process.IsValid());
 
   int exit_code = -1;
-  ASSERT_TRUE(child.WaitForExit(&exit_code));
+  ASSERT_TRUE(spawn_child.process.WaitForExit(&exit_code));
   EXPECT_EQ(0, exit_code);
 
-  EXPECT_EQ(child.Pid(), sender_pid);
-  EXPECT_EQ(child.Pid(), child_pid);
+  EXPECT_EQ(spawn_child.process.Pid(), sender_pid);
+  EXPECT_EQ(spawn_child.process.Pid(), child_pid);
   EXPECT_EQ(sender_pid, child_pid);
 }
 
 MULTIPROCESS_TEST_MAIN(GetSenderPID) {
   mach_port_t port = MACH_PORT_NULL;
   CHECK_EQ(KERN_SUCCESS, bootstrap_look_up(bootstrap_port, kGetSenderPID,
       &port));
   base::mac::ScopedMachSendRight scoped_port(port);
 
   xpc_pipe_t pipe = xpc_pipe_create_from_port(port, 0);
@@ skipping 32 matching lines @@
   ASSERT_EQ(0, xpc_pipe_routine(first.pipe(), request, &reply));
 
   EXPECT_EQ(1, xpc_dictionary_get_int64(reply, "seen_by_first"));
   EXPECT_EQ(2, xpc_dictionary_get_int64(reply, "seen_by_second"));
 
   xpc_release(request);
   xpc_release(reply);
 }
 
 }  // namespace sandbox