Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(807)

Unified Diff: sandbox/mac/bootstrap_sandbox_unittest.mm

Issue 2733323002: Changing multiprocess test SpawnChild to return a struct. (Closed)
Patch Set: Fixed bots. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sandbox/mac/bootstrap_sandbox_unittest.mm
diff --git a/sandbox/mac/bootstrap_sandbox_unittest.mm b/sandbox/mac/bootstrap_sandbox_unittest.mm
index a6225a91c32ab07531624057ddcd96dd9dc17d2a..79732a93cff3aaf4b0734d22dab7fa5e0be3b354 100644
--- a/sandbox/mac/bootstrap_sandbox_unittest.mm
+++ b/sandbox/mac/bootstrap_sandbox_unittest.mm
@@ -104,7 +104,9 @@ class BootstrapSandboxTest : public base::MultiProcessTest {
base::LaunchOptions options;
options.pre_exec_delegate = pre_exec_delegate.get();
- base::Process process = SpawnChildWithOptions(child_name, options);
+ base::SpawnChildResult spawn_result =
+ SpawnChildWithOptions(child_name, options);
+ base::Process process = std::move(spawn_result.process);
ASSERT_TRUE(process.IsValid());
int code = 0;
EXPECT_TRUE(process.WaitForExit(&code));
@@ -124,7 +126,8 @@ TEST_F(BootstrapSandboxTest, DistributedNotifications_Unsandboxed) {
base::scoped_nsobject<DistributedNotificationObserver> observer(
[[DistributedNotificationObserver alloc] init]);
- base::Process process = SpawnChild(kNotificationTestMain);
+ base::SpawnChildResult spawn_result = SpawnChild(kNotificationTestMain);
+ base::Process process = std::move(spawn_result.process);
ASSERT_TRUE(process.IsValid());
int code = 0;
EXPECT_TRUE(process.WaitForExit(&code));
@@ -471,7 +474,9 @@ TEST_F(BootstrapSandboxTest, ChildOutliveSandbox) {
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());
// Synchronize with the child.

Powered by Google App Engine
This is Rietveld 408576698