Changing multiprocess test SpawnChild to return a struct.

chrome/common/service_process_util_unittest.cc

 // Copyright (c) 2012 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/service_process_util.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 83 matching lines @@
 
 ServiceProcessStateTest::~ServiceProcessStateTest() {
 }
 
 void ServiceProcessStateTest::SetUp() {
   base::Thread::Options options(base::MessageLoop::TYPE_IO, 0);
   ASSERT_TRUE(io_thread_.StartWithOptions(options));
 }
 
 void ServiceProcessStateTest::LaunchAndWait(const std::string& name) {
-  base::Process process = SpawnChild(name);
-  ASSERT_TRUE(process.IsValid());
+  base::SpawnChildResult spawn_child = SpawnChild(name);
+  ASSERT_TRUE(spawn_child.process.IsValid());
   int exit_code = 0;
-  ASSERT_TRUE(process.WaitForExit(&exit_code));
+  ASSERT_TRUE(spawn_child.process.WaitForExit(&exit_code));
   ASSERT_EQ(exit_code, 0);
 }
 
 TEST_F(ServiceProcessStateTest, Singleton) {
   ServiceProcessState state;
   ASSERT_TRUE(state.Initialize());
   LaunchAndWait("ServiceProcessStateTestSingleton");
 }
 
 // http://crbug.com/396390
@@ skipping 70 matching lines @@
   // implementation on Posix, this check will only execute on Windows.
   ASSERT_FALSE(GetServiceProcessData(&version, &pid));
 #endif  // defined(OS_WIN)
   ServiceProcessState state;
   ASSERT_TRUE(state.Initialize());
   ASSERT_TRUE(GetServiceProcessData(&version, &pid));
   ASSERT_EQ(base::GetCurrentProcId(), pid);
 }
 
 TEST_F(ServiceProcessStateTest, MAYBE_ForceShutdown) {
-  base::Process process = SpawnChild("ServiceProcessStateTestShutdown");
-  ASSERT_TRUE(process.IsValid());
+  base::SpawnChildResult spawn_child =
+      SpawnChild("ServiceProcessStateTestShutdown");
+  ASSERT_TRUE(spawn_child.process.IsValid());
   for (int i = 0; !CheckServiceProcessReady() && i < 10; ++i) {
     base::PlatformThread::Sleep(TestTimeouts::tiny_timeout());
   }
   ASSERT_TRUE(CheckServiceProcessReady());
   std::string version;
   base::ProcessId pid;
   ASSERT_TRUE(GetServiceProcessData(&version, &pid));
   ASSERT_TRUE(ForceServiceProcessShutdown(version, pid));
   int exit_code = 0;
-  ASSERT_TRUE(process.WaitForExitWithTimeout(TestTimeouts::action_max_timeout(),
-                                             &exit_code));
+  ASSERT_TRUE(spawn_child.process.WaitForExitWithTimeout(
+      TestTimeouts::action_max_timeout(), &exit_code));
   ASSERT_EQ(exit_code, 0);
 }
 
 MULTIPROCESS_TEST_MAIN(ServiceProcessStateTestSingleton) {
   ServiceProcessState state;
   EXPECT_FALSE(state.Initialize());
   return 0;
 }
 
 MULTIPROCESS_TEST_MAIN(ServiceProcessStateTestReadyTrue) {
@@ skipping 20 matching lines @@
   message_loop.task_runner()->PostDelayedTask(
       FROM_HERE, run_loop.QuitWhenIdleClosure(),
       TestTimeouts::action_max_timeout());
   EXPECT_FALSE(g_good_shutdown);
   run_loop.Run();
   EXPECT_TRUE(g_good_shutdown);
   return 0;
 }
 
 #endif  // !OS_MACOSX