Changing multiprocess test SpawnChild to return a struct.

components/browser_watcher/exit_code_watcher_win_unittest.cc

 // Copyright (c) 2014 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 "components/browser_watcher/exit_code_watcher_win.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 23 matching lines @@
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(INFINITE));
   return 1;
 }
 
 class ScopedSleeperProcess {
  public:
    ScopedSleeperProcess() : is_killed_(false) {
   }
 
   ~ScopedSleeperProcess() {
-    if (process_.IsValid()) {
-      process_.Terminate(-1, false);
-      EXPECT_TRUE(process_.WaitForExit(nullptr));
+    if (spawn_child_.process.IsValid()) {
+      spawn_child_.process.Terminate(-1, false);
+      EXPECT_TRUE(spawn_child_.process.WaitForExit(nullptr));
     }
   }
 
   void Launch() {
-    ASSERT_FALSE(process_.IsValid());
+    ASSERT_FALSE(spawn_child_.process.IsValid());
 
     base::CommandLine cmd_line(base::GetMultiProcessTestChildBaseCommandLine());
     base::LaunchOptions options;
     options.start_hidden = true;
-    process_ = base::SpawnMultiProcessTestChild("Sleeper", cmd_line, options);
-    ASSERT_TRUE(process_.IsValid());
+    spawn_child_ =
+        base::SpawnMultiProcessTestChild("Sleeper", cmd_line, options);
+    ASSERT_TRUE(spawn_child_.process.IsValid());
   }
 
   void Kill(int exit_code, bool wait) {
-    ASSERT_TRUE(process_.IsValid());
+    ASSERT_TRUE(spawn_child_.process.IsValid());
     ASSERT_FALSE(is_killed_);
-    process_.Terminate(exit_code, false);
+    spawn_child_.process.Terminate(exit_code, false);
     int seen_exit_code = 0;
-    EXPECT_TRUE(process_.WaitForExit(&seen_exit_code));
+    EXPECT_TRUE(spawn_child_.process.WaitForExit(&seen_exit_code));
     EXPECT_EQ(exit_code, seen_exit_code);
     is_killed_ = true;
   }
 
-  const base::Process& process() const { return process_; }
+  const base::Process& process() const { return spawn_child_.process; }
 
  private:
-  base::Process process_;
+  base::SpawnChildResult spawn_child_;
   bool is_killed_;
 };
 
 class ExitCodeWatcherTest : public testing::Test {
  public:
   typedef testing::Test Super;
 
   static const int kExitCode = 0xCAFEBABE;
 
   ExitCodeWatcherTest() : cmd_line_(base::CommandLine::NO_PROGRAM) {}
@@ skipping 82 matching lines @@
   // Kill the sleeper, and make sure it's exited before we continue.
   ASSERT_NO_FATAL_FAILURE(sleeper.Kill(kExitCode, true));
 
   watcher.WaitForExit();
   EXPECT_EQ(kExitCode, watcher.exit_code());
 
   VerifyWroteExitCode(sleeper.process().Pid(), kExitCode);
 }
 
 }  // namespace browser_watcher