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

Unified Diff: chrome/common/multi_process_lock_unittest.cc

Issue 2735113003: Changing SpawnChild to return a struct.
Patch Set: 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: chrome/common/multi_process_lock_unittest.cc
diff --git a/chrome/common/multi_process_lock_unittest.cc b/chrome/common/multi_process_lock_unittest.cc
index e51726d62267d8c68bc286b77995996dd999cf72..27f511d7d227f221be315d4b30dce56a2d668ea3 100644
--- a/chrome/common/multi_process_lock_unittest.cc
+++ b/chrome/common/multi_process_lock_unittest.cc
@@ -54,7 +54,9 @@ std::string MultiProcessLockTest::GenerateLockName() {
void MultiProcessLockTest::ExpectLockIsLocked(const std::string &name) {
ScopedEnvironmentVariable var(kLockEnviromentVarName, name);
- base::Process process = SpawnChild("MultiProcessLockTryFailMain");
+ base::SpawnChildResult spawn_result =
+ SpawnChild("MultiProcessLockTryFailMain");
+ base::Process process = std::move(spawn_result.process);
ASSERT_TRUE(process.IsValid());
int exit_code = -1;
EXPECT_TRUE(process.WaitForExit(&exit_code));
@@ -64,7 +66,9 @@ void MultiProcessLockTest::ExpectLockIsLocked(const std::string &name) {
void MultiProcessLockTest::ExpectLockIsUnlocked(
const std::string &name) {
ScopedEnvironmentVariable var(kLockEnviromentVarName, name);
- base::Process process = SpawnChild("MultiProcessLockTrySucceedMain");
+ base::SpawnChildResult spawn_result =
+ SpawnChild("MultiProcessLockTrySucceedMain");
+ base::Process process = std::move(spawn_result.process);
ASSERT_TRUE(process.IsValid());
int exit_code = -1;
EXPECT_TRUE(process.WaitForExit(&exit_code));
« no previous file with comments | « chrome/common/component_flash_hint_file_linux_unittest.cc ('k') | chrome/common/service_process_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698