Changing multiprocess test SpawnChild to return a struct.

base/files/file_locking_unittest.cc

 // Copyright 2015 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 "base/command_line.h"
 #include "base/files/file.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/test/multiprocess_test.h"
@@ skipping 134 matching lines @@
 
   // Start a child process set to use the specified unlock action, and wait for
   // it to lock the file.
   void StartChildAndSignalLock(const char* unlock_action) {
     // Create a temporary dir and spin up a ChildLockExit subprocess against it.
     const FilePath temp_path = temp_dir_.GetPath();
     base::CommandLine child_command_line(
         base::GetMultiProcessTestChildBaseCommandLine());
     child_command_line.AppendSwitchPath(kTempDirFlag, temp_path);
     child_command_line.AppendSwitch(unlock_action);
-    lock_child_ =
-        base::SpawnMultiProcessTestChild(ChildMainString, child_command_line,
-                                         base::LaunchOptions());
-    ASSERT_TRUE(lock_child_.IsValid());
+
+    spawn_child_ = base::SpawnMultiProcessTestChild(
+        ChildMainString, child_command_line, base::LaunchOptions());
+    ASSERT_TRUE(spawn_child_.process.IsValid());
 
     // Wait for the child to lock the file.
     ASSERT_TRUE(WaitForEventOrTimeout(kSignalLockFileLocked));
   }
 
   // Signal the child to exit cleanly.
   void ExitChildCleanly() {
     ASSERT_TRUE(SignalEvent(kSignalExit));
     int rv = -1;
     ASSERT_TRUE(WaitForMultiprocessTestChildExit(
-        lock_child_, TestTimeouts::action_timeout(), &rv));
+        spawn_child_.process, TestTimeouts::action_timeout(), &rv));
     ASSERT_EQ(0, rv);
   }
 
   base::ScopedTempDir temp_dir_;
   base::File lock_file_;
-  base::Process lock_child_;
+  base::SpawnChildResult spawn_child_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FileLockingTest);
 };
 
 // Test that locks are released by Unlock().
 TEST_F(FileLockingTest, LockAndUnlock) {
   StartChildAndSignalLock(kFileUnlock);
 
   ASSERT_NE(File::FILE_OK, lock_file_.Lock());
@@ skipping 27 matching lines @@
   ASSERT_EQ(File::FILE_OK, lock_file_.Lock());
   ASSERT_EQ(File::FILE_OK, lock_file_.Unlock());
 }
 
 // Test that killing the process releases the lock.  This should cover crashing.
 TEST_F(FileLockingTest, UnlockOnTerminate) {
   // The child will wait for an exit which never arrives.
   StartChildAndSignalLock(kExitUnlock);
 
   ASSERT_NE(File::FILE_OK, lock_file_.Lock());
-  ASSERT_TRUE(TerminateMultiProcessTestChild(lock_child_, 0, true));
+  ASSERT_TRUE(TerminateMultiProcessTestChild(spawn_child_.process, 0, true));
   ASSERT_EQ(File::FILE_OK, lock_file_.Lock());
   ASSERT_EQ(File::FILE_OK, lock_file_.Unlock());
 }