Changing multiprocess test SpawnChild to return a struct.

content/browser/mach_broker_mac_unittest.cc

 // Copyright (c) 2009 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 "content/browser/mach_broker_mac.h"
 
 #include "base/command_line.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/multiprocess_test.h"
@@ skipping 27 matching lines @@
     broker_.InvalidateChildProcessId(child_process_id);
   }
 
   int GetChildProcessCount(int child_process_id) {
     return broker_.child_process_id_map_.count(child_process_id);
   }
 
   base::Process LaunchTestChild(const std::string& function,
                                 int child_process_id) {
     base::AutoLock lock(broker_.GetLock());
-    base::Process test_child_process = base::SpawnMultiProcessTestChild(
+    base::SpawnChildResult spaw_result = base::SpawnMultiProcessTestChild(
         function, base::GetMultiProcessTestChildBaseCommandLine(),
         base::LaunchOptions());
+    base::Process test_child_process = std::move(spaw_result.process);
     broker_.AddPlaceholderForPid(test_child_process.Handle(), child_process_id);
     return test_child_process;
   }
 
   void WaitForChildExit(base::Process& process) {
     int rv = -1;
     ASSERT_TRUE(process.WaitForExitWithTimeout(
                 TestTimeouts::action_timeout(), &rv));
     EXPECT_EQ(0, rv);
   }
@@ skipping 43 matching lines @@
   EXPECT_EQ(static_cast<mach_port_t>(MACH_PORT_NULL),
             broker_.TaskForPid(child_process.Handle() + 1));
 
   InvalidateChildProcessId(7);
   EXPECT_EQ(static_cast<mach_port_t>(MACH_PORT_NULL),
             broker_.TaskForPid(child_process.Handle()));
   EXPECT_EQ(0, GetChildProcessCount(7));
 }
 
 }  // namespace content