Changing multiprocess test SpawnChild to return a struct.

mojo/edk/test/multiprocess_test_helper.h

 // 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.
 
 #ifndef MOJO_EDK_TEST_MULTIPROCESS_TEST_HELPER_H_
 #define MOJO_EDK_TEST_MULTIPROCESS_TEST_HELPER_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 62 matching lines @@
   // usually return -1 on error in the child (e.g., if |test_child_name| was not
   // found), but this is mangled to 255 on Linux. You should only rely on codes
   // 0-127 being preserved, and -1 being outside the range 0-127.
   int WaitForChildShutdown();
 
   // Like |WaitForChildShutdown()|, but returns true on success (exit code of 0)
   // and false otherwise. You probably want to do something like
   // |EXPECT_TRUE(WaitForChildTestShutdown());|.
   bool WaitForChildTestShutdown();
 
-  const base::Process& test_child() const { return test_child_; }
+  const base::Process& test_child() const { return test_child_.process; }
 
   // Used by macros in mojo/edk/test/mojo_test_base.h to support multiprocess
   // test client initialization.
   static void ChildSetup();
   static int RunClientMain(const base::Callback<int(MojoHandle)>& main);
   static int RunClientTestMain(const base::Callback<void(MojoHandle)>& main);
 
   // For use (and only valid) in the child process:
   static mojo::ScopedMessagePipeHandle primordial_pipe;
 
  private:
   // Valid after |StartChild()| and before |WaitForChildShutdown()|.
-  base::Process test_child_;
+  base::SpawnChildResult test_child_;
 
   ProcessErrorCallback process_error_callback_;
 
   std::string peer_token_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiprocessTestHelper);
 };
 
 }  // namespace test
 }  // namespace edk
 }  // namespace mojo
 
 #endif  // MOJO_EDK_TEST_MULTIPROCESS_TEST_HELPER_H_