Changing 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 16 matching lines @@
 #include "mojo/edk/embedder/named_platform_handle.h"
 #include "mojo/edk/embedder/named_platform_handle_utils.h"
 #include "mojo/edk/embedder/pending_process_connection.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
 #include "base/mac/mach_port_broker.h"
+#elif defined(OS_ANDROID)
+// #include "base/android/parcelable_channel.h"
 #endif
 
 namespace mojo {
 namespace edk {
 namespace test {
 
 namespace {
 
 const char kMojoPrimordialPipeToken[] = "mojo-primordial-pipe-token";
 const char kMojoNamedPipeName[] = "mojo-named-pipe-name";
@@ skipping 106 matching lines @@
       launch_type == LaunchType::NAMED_CHILD) {
     std::string pipe_token;
     pipe = process.CreateMessagePipe(&pipe_token);
     command_line.AppendSwitchASCII(kMojoPrimordialPipeToken, pipe_token);
   } else if (launch_type == LaunchType::PEER ||
              launch_type == LaunchType::NAMED_PEER) {
     peer_token_ = mojo::edk::GenerateRandomToken();
     pipe = ConnectToPeerProcess(std::move(server_handle), peer_token_);
   }
 
-  test_child_ =
+  base::SpawnChildResult result =
       base::SpawnMultiProcessTestChild(test_child_main, command_line, options);
+  test_child_ = std::move(result.process);
   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(), std::move(server_handle),
+#if defined(OS_ANDROID)
+    ConnectionParam connection_param(std::move(server_handle),
+                                     base::android::ParcelableChannelClient(
+                                         result.parcelable_channel_client),
+                                     base::android::ParcelableChannelServer(
+                                         result.parcelable_channel_server));
+#else
+    ConnectionParam connection_param(std::move(server_handle));
+#endif
+    process.Connect(test_child_.Handle(), std::move(connection_param),
                     process_error_callback_);
   }
 
   CHECK(test_child_.IsValid());
   return pipe;
 }
 
 int MultiprocessTestHelper::WaitForChildShutdown() {
   CHECK(test_child_.IsValid());
 
@@ skipping 64 matching lines @@
             ::testing::Test::HasNonfatalFailure()) ? 1 : 0;
   });
 }
 
 // static
 mojo::ScopedMessagePipeHandle MultiprocessTestHelper::primordial_pipe;
 
 }  // namespace test
 }  // namespace edk
 }  // namespace mojo