Changing multiprocess test SpawnChild to return a struct.

mojo/edk/test/multiprocess_test_helper.cc

 // Copyright 2013 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 "mojo/edk/test/multiprocess_test_helper.h"
 
 #include <functional>
 #include <set>
 #include <utility>
 
@@ skipping 40 matching lines @@
   ScopedMessagePipeHandle pipe =
       std::move(MultiprocessTestHelper::primordial_pipe);
   return handler(pipe.get().value());
 }
 
 }  // namespace
 
 MultiprocessTestHelper::MultiprocessTestHelper() {}
 
 MultiprocessTestHelper::~MultiprocessTestHelper() {
-  CHECK(!test_child_.IsValid());
+  CHECK(!test_child_.process.IsValid());
 }
 
 ScopedMessagePipeHandle MultiprocessTestHelper::StartChild(
     const std::string& test_child_name,
     LaunchType launch_type) {
   return StartChildWithExtraSwitch(test_child_name, std::string(),
                                    std::string(), launch_type);
 }
 
 ScopedMessagePipeHandle MultiprocessTestHelper::StartChildWithExtraSwitch(
     const std::string& test_child_name,
     const std::string& switch_string,
     const std::string& switch_value,
     LaunchType launch_type) {
   CHECK(!test_child_name.empty());
-  CHECK(!test_child_.IsValid());
+  CHECK(!test_child_.process.IsValid());
 
   std::string test_child_main = test_child_name + "TestChildMain";
 
   // Manually construct the new child's commandline to avoid copying unwanted
   // values.
   base::CommandLine command_line(
       base::GetMultiProcessTestChildBaseCommandLine().GetProgram());
 
   std::set<std::string> uninherited_args;
   uninherited_args.insert("mojo-platform-channel-handle");
@@ skipping 73 matching lines @@
   }
 
   test_child_ =
       base::SpawnMultiProcessTestChild(test_child_main, command_line, options);
   if (launch_type == LaunchType::CHILD || launch_type == LaunchType::PEER)
     channel.ChildProcessLaunched();
 
   if (launch_type == LaunchType::CHILD ||
       launch_type == LaunchType::NAMED_CHILD) {
     DCHECK(server_handle.is_valid());
-    process.Connect(test_child_.Handle(),
+    process.Connect(test_child_.process.Handle(),
                     ConnectionParams(std::move(server_handle)),
                     process_error_callback_);
   }
 
-  CHECK(test_child_.IsValid());
+  CHECK(test_child_.process.IsValid());
   return pipe;
 }
 
 int MultiprocessTestHelper::WaitForChildShutdown() {
-  CHECK(test_child_.IsValid());
+  CHECK(test_child_.process.IsValid());
 
   int rv = -1;
-  WaitForMultiprocessTestChildExit(test_child_, TestTimeouts::action_timeout(),
-                                   &rv);
-  test_child_.Close();
+  WaitForMultiprocessTestChildExit(test_child_.process,
+                                   TestTimeouts::action_timeout(), &rv);
+  test_child_.process.Close();
   return rv;
 }
 
 void MultiprocessTestHelper::ClosePeerConnection() {
   DCHECK(!peer_token_.empty());
   ::mojo::edk::ClosePeerConnection(peer_token_);
   peer_token_.clear();
 }
 
 bool MultiprocessTestHelper::WaitForChildTestShutdown() {
@@ skipping 50 matching lines @@
             ::testing::Test::HasNonfatalFailure()) ? 1 : 0;
   });
 }
 
 // static
 mojo::ScopedMessagePipeHandle MultiprocessTestHelper::primordial_pipe;
 
 }  // namespace test
 }  // namespace edk
 }  // namespace mojo