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 24 matching lines @@
   }
 
   void InvalidateChildProcessId(int child_process_id) {
     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::SpawnChildResult LaunchTestChild(const std::string& function,
+                                         int child_process_id) {
     base::AutoLock lock(broker_.GetLock());
-    base::Process test_child_process = base::SpawnMultiProcessTestChild(
+    base::SpawnChildResult spawn_child = base::SpawnMultiProcessTestChild(
         function, base::GetMultiProcessTestChildBaseCommandLine(),
         base::LaunchOptions());
-    broker_.AddPlaceholderForPid(test_child_process.Handle(), child_process_id);
-    return test_child_process;
+    broker_.AddPlaceholderForPid(spawn_child.process.Handle(),
+                                 child_process_id);
+    return spawn_child;
   }
 
   void WaitForChildExit(base::Process& process) {
     int rv = -1;
     ASSERT_TRUE(process.WaitForExitWithTimeout(
                 TestTimeouts::action_timeout(), &rv));
     EXPECT_EQ(0, rv);
   }
 
   void WaitForTaskPort() {
@@ skipping 21 matching lines @@
 TEST_F(MachBrokerTest, Locks) {
   // Acquire and release the locks.  Nothing bad should happen.
   base::AutoLock lock(broker_.GetLock());
 }
 
 TEST_F(MachBrokerTest, AddChildProcess) {
   {
     base::AutoLock lock(broker_.GetLock());
     broker_.EnsureRunning();
   }
-  base::Process child_process = LaunchTestChild("MachBrokerTestChild", 7);
+  base::SpawnChildResult spawn_child =
+      LaunchTestChild("MachBrokerTestChild", 7);
   WaitForTaskPort();
-  EXPECT_EQ(child_process.Handle(), received_process_);
-  WaitForChildExit(child_process);
+  EXPECT_EQ(spawn_child.process.Handle(), received_process_);
+  WaitForChildExit(spawn_child.process);
 
   EXPECT_NE(static_cast<mach_port_t>(MACH_PORT_NULL),
-            broker_.TaskForPid(child_process.Handle()));
+            broker_.TaskForPid(spawn_child.process.Handle()));
   EXPECT_EQ(1, GetChildProcessCount(7));
 
   // Should be no entry for any other PID.
   EXPECT_EQ(static_cast<mach_port_t>(MACH_PORT_NULL),
-            broker_.TaskForPid(child_process.Handle() + 1));
+            broker_.TaskForPid(spawn_child.process.Handle() + 1));
 
   InvalidateChildProcessId(7);
   EXPECT_EQ(static_cast<mach_port_t>(MACH_PORT_NULL),
-            broker_.TaskForPid(child_process.Handle()));
+            broker_.TaskForPid(spawn_child.process.Handle()));
   EXPECT_EQ(0, GetChildProcessCount(7));
 }
 
 }  // namespace content