Changing multiprocess test SpawnChild to return a struct.

chrome/common/multi_process_lock_unittest.cc

 // Copyright (c) 2011 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 "chrome/common/multi_process_lock.h"
 
 #include <memory>
 
 #include "base/environment.h"
 #include "base/logging.h"
@@ skipping 36 matching lines @@
     = "MULTI_PROCESS_TEST_LOCK_NAME";
 
 std::string MultiProcessLockTest::GenerateLockName() {
   base::Time now = base::Time::NowFromSystemTime();
   return base::StringPrintf("multi_process_test_lock %lf%lf",
                             now.ToDoubleT(), base::RandDouble());
 }
 
 void MultiProcessLockTest::ExpectLockIsLocked(const std::string &name) {
   ScopedEnvironmentVariable var(kLockEnviromentVarName, name);
-  base::Process process = SpawnChild("MultiProcessLockTryFailMain");
-  ASSERT_TRUE(process.IsValid());
+  base::SpawnChildResult spawn_child =
+      SpawnChild("MultiProcessLockTryFailMain");
+  ASSERT_TRUE(spawn_child.process.IsValid());
   int exit_code = -1;
-  EXPECT_TRUE(process.WaitForExit(&exit_code));
+  EXPECT_TRUE(spawn_child.process.WaitForExit(&exit_code));
   EXPECT_EQ(0, exit_code);
 }
 
 void MultiProcessLockTest::ExpectLockIsUnlocked(
     const std::string &name) {
   ScopedEnvironmentVariable var(kLockEnviromentVarName, name);
-  base::Process process = SpawnChild("MultiProcessLockTrySucceedMain");
-  ASSERT_TRUE(process.IsValid());
+  base::SpawnChildResult spawn_child =
+      SpawnChild("MultiProcessLockTrySucceedMain");
+  ASSERT_TRUE(spawn_child.process.IsValid());
   int exit_code = -1;
-  EXPECT_TRUE(process.WaitForExit(&exit_code));
+  EXPECT_TRUE(spawn_child.process.WaitForExit(&exit_code));
   EXPECT_EQ(0, exit_code);
 }
 
 TEST_F(MultiProcessLockTest, BasicCreationTest) {
   // Test basic creation/destruction with no lock taken
   std::string name = GenerateLockName();
   std::unique_ptr<MultiProcessLock> scoped(MultiProcessLock::Create(name));
   ExpectLockIsUnlocked(name);
   scoped.reset(NULL);
 }
@@ skipping 88 matching lines @@
   std::unique_ptr<base::Environment> environment(base::Environment::Create());
   EXPECT_TRUE(environment->GetVar(MultiProcessLockTest::kLockEnviromentVarName,
                                   &name));
   std::unique_ptr<MultiProcessLock> test_lock(MultiProcessLock::Create(name));
 
   // Expect locking to succeed because it is not claimed yet.
   bool locked_successfully = test_lock->TryLock();
   EXPECT_TRUE(locked_successfully);
   return !locked_successfully;
 }