Changing multiprocess test SpawnChild to return a struct.

sandbox/mac/bootstrap_sandbox_unittest.mm

 // 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/bootstrap_sandbox.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #import <Foundation/Foundation.h>
 #include <mach/mach.h>
 #include <servers/bootstrap.h>
@@ skipping 86 matching lines @@
 
   void RunChildWithPolicy(int policy_id,
                           const char* child_name,
                           base::ProcessHandle* out_pid) {
     std::unique_ptr<PreExecDelegate> pre_exec_delegate(
         sandbox_->NewClient(policy_id));
 
     base::LaunchOptions options;
     options.pre_exec_delegate = pre_exec_delegate.get();
 
-    base::Process process = SpawnChildWithOptions(child_name, options);
-    ASSERT_TRUE(process.IsValid());
+    base::SpawnChildResult spawn_child =
+        SpawnChildWithOptions(child_name, options);
+    ASSERT_TRUE(spawn_child.process.IsValid());
     int code = 0;
-    EXPECT_TRUE(process.WaitForExit(&code));
+    EXPECT_TRUE(spawn_child.process.WaitForExit(&code));
     EXPECT_EQ(0, code);
     if (out_pid)
-      *out_pid = process.Pid();
+      *out_pid = spawn_child.process.Pid();
   }
 
  protected:
   std::unique_ptr<BootstrapSandbox> sandbox_;
 };
 
 const char kNotificationTestMain[] = "PostNotification";
 
 // Run the test without the sandbox.
 TEST_F(BootstrapSandboxTest, DistributedNotifications_Unsandboxed) {
   base::scoped_nsobject<DistributedNotificationObserver> observer(
       [[DistributedNotificationObserver alloc] init]);
 
-  base::Process process = SpawnChild(kNotificationTestMain);
-  ASSERT_TRUE(process.IsValid());
+  base::SpawnChildResult spawn_child = SpawnChild(kNotificationTestMain);
+  ASSERT_TRUE(spawn_child.process.IsValid());
   int code = 0;
-  EXPECT_TRUE(process.WaitForExit(&code));
+  EXPECT_TRUE(spawn_child.process.WaitForExit(&code));
   EXPECT_EQ(0, code);
 
   [observer waitForNotification];
   EXPECT_EQ(1, [observer receivedCount]);
-  EXPECT_EQ(process.Pid(), [[observer object] intValue]);
+  EXPECT_EQ(spawn_child.process.Pid(), [[observer object] intValue]);
 }
 
 // Run the test with the sandbox enabled without notifications on the policy
 // whitelist.
 TEST_F(BootstrapSandboxTest, DistributedNotifications_SandboxDeny) {
   if (base::mac::IsAtLeastOS10_12()) {
     LOG(ERROR) << "BootstrapSandbox does not work on macOS Sierra or later.";
     return;
   }
 
@@ skipping 318 matching lines @@
   // Set up the policy and register the port.
   BootstrapSandboxPolicy policy(BaselinePolicy());
   policy.rules["sync"] = Rule(port);
   sandbox_->RegisterSandboxPolicy(kTestPolicyId, policy);
 
   // Launch the child.
   std::unique_ptr<PreExecDelegate> pre_exec_delegate(
       sandbox_->NewClient(kTestPolicyId));
   base::LaunchOptions options;
   options.pre_exec_delegate = pre_exec_delegate.get();
-  base::Process process = SpawnChildWithOptions("ChildOutliveSandbox", options);
+  base::SpawnChildResult spawn_result =
+      SpawnChildWithOptions("ChildOutliveSandbox", options);
+  base::Process process = std::move(spawn_result.process);
   ASSERT_TRUE(process.IsValid());

[dcheng, 2017/03/14 05:28:51]

Ditto

[Jay Civelli, 2017/03/14 16:29:13]

Done.

 
   // Synchronize with the child.
   mach_msg_empty_rcv_t rcv_msg;
   bzero(&rcv_msg, sizeof(rcv_msg));
   kern_return_t kr = mach_msg(&rcv_msg.header, MACH_RCV_MSG, 0,
       sizeof(rcv_msg), port,
       TestTimeouts::tiny_timeout().InMilliseconds(), MACH_PORT_NULL);
   ASSERT_EQ(KERN_SUCCESS, kr) << mach_error_string(kr);
 
   // Destroy the sandbox.
@@ skipping 54 matching lines @@
   kr = mach_msg_receive(&rcv_msg.header);
   MACH_CHECK(kr == KERN_SUCCESS, kr) << "mach_msg_receive";
 
   // Try to message the sandbox.
   bootstrap_look_up(bootstrap_port, "test", &port);
 
   return 0;
 }
 
 }  // namespace sandbox