Changing multiprocess test SpawnChild to return a struct.

base/mac/mach_port_broker_unittest.cc

 // Copyright 2016 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/mac/mach_port_broker.h"
 
 #include "base/command_line.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/multiprocess_test.h"
@@ skipping 77 matching lines @@
 MULTIPROCESS_TEST_MAIN(MachPortBrokerTestChild) {
   CHECK(base::MachPortBroker::ChildSendTaskPortToParent(kBootstrapPortName));
   return 0;
 }
 
 TEST_F(MachPortBrokerTest, ReceivePortFromChild) {
   ASSERT_TRUE(broker_.Init());
   CommandLine command_line(
       base::GetMultiProcessTestChildBaseCommandLine());
   broker_.GetLock().Acquire();
-  base::Process test_child_process = base::SpawnMultiProcessTestChild(
+  base::SpawnChildResult spawn_result = base::SpawnMultiProcessTestChild(
       "MachPortBrokerTestChild", command_line, LaunchOptions());
+  base::Process test_child_process = std::move(spawn_result.process);
   broker_.AddPlaceholderForPid(test_child_process.Handle());
   broker_.GetLock().Release();
 
   WaitForTaskPort();
   EXPECT_EQ(test_child_process.Handle(), received_process_);
 
   int rv = -1;
   ASSERT_TRUE(test_child_process.WaitForExitWithTimeout(
       TestTimeouts::action_timeout(), &rv));
   EXPECT_EQ(0, rv);
 
   EXPECT_NE(static_cast<mach_port_t>(MACH_PORT_NULL),
             broker_.TaskForPid(test_child_process.Handle()));
 }
 
 TEST_F(MachPortBrokerTest, ReceivePortFromChildWithoutAdding) {
   ASSERT_TRUE(broker_.Init());
   CommandLine command_line(
       base::GetMultiProcessTestChildBaseCommandLine());
   broker_.GetLock().Acquire();
-  base::Process test_child_process = base::SpawnMultiProcessTestChild(
+  base::SpawnChildResult spawn_result = base::SpawnMultiProcessTestChild(
       "MachPortBrokerTestChild", command_line, LaunchOptions());
+  base::Process test_child_process = std::move(spawn_result.process);
+
   broker_.GetLock().Release();
 
   int rv = -1;
   ASSERT_TRUE(test_child_process.WaitForExitWithTimeout(
       TestTimeouts::action_timeout(), &rv));
   EXPECT_EQ(0, rv);
 
   EXPECT_EQ(static_cast<mach_port_t>(MACH_PORT_NULL),
             broker_.TaskForPid(test_child_process.Handle()));
 }
 
 }  // namespace base