Changing SpawnChild to return a struct.

mojo/edk/embedder/embedder.cc

 // Copyright 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 "mojo/edk/embedder/embedder.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "mojo/edk/embedder/embedder_internal.h"
 #include "mojo/edk/embedder/entrypoints.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/system/core.h"
 #include "mojo/edk/system/node_controller.h"
 
+#if defined(OS_ANDROID)
+#include "base/android/global_object_registry.h"
+#include "base/android/jni_android.h"
+#include "base/android/parcelable_channel_client.h"
+#include "base/android/parcelable_channel_server.h"
+#include "base/android/scoped_java_ref.h"
+#endif
+
 #if !defined(OS_NACL)
 #include "crypto/random.h"
 #endif
 
 namespace mojo {
 namespace edk {
 
 class Core;
 class PlatformSupport;
 
+namespace {
+#if defined(OS_ANDROID)
+const int kParcelableChannelClientID = 1;
+const int kParcelableChannelServerID = 2;
+#endif
+}  // namespace
+
 namespace internal {
 
 Core* g_core;
 
 Core* GetCore() { return g_core; }
 
 }  // namespace internal
 
 void SetMaxMessageSize(size_t bytes) {
 }
 
 void SetParentPipeHandle(ScopedPlatformHandle pipe) {
   CHECK(internal::g_core);
-  internal::g_core->InitChild(std::move(pipe));
+#if defined(OS_ANDROID)
+  base::android::GlobalObjectRegistry* object_registry =
+      base::android::GlobalObjectRegistry::GetInstance();
+
+  base::android::ParcelableChannelClient parcelable_channel_client(
+      object_registry->Take(kParcelableChannelClientID));
+  base::android::ParcelableChannelServer parcelable_channel_server(
+      object_registry->Take(kParcelableChannelServerID));
+
+  ConnectionParam connection_param(std::move(pipe),
+                                   std::move(parcelable_channel_client),
+                                   std::move(parcelable_channel_server));
+#else
+  ConnectionParam connection_param(std::move(pipe));
+#endif
+  internal::g_core->InitChild(std::move(connection_param));
 }
 
 void SetParentPipeHandleFromCommandLine() {
   ScopedPlatformHandle platform_channel =
       PlatformChannelPair::PassClientHandleFromParentProcess(
           *base::CommandLine::ForCurrentProcess());
   CHECK(platform_channel.is_valid());
   SetParentPipeHandle(std::move(platform_channel));
 }
 
@@ skipping 91 matching lines @@
   return base::HexEncode(random_bytes, 16);
 }
 
 MojoResult SetProperty(MojoPropertyType type, const void* value) {
   CHECK(internal::g_core);
   return internal::g_core->SetProperty(type, value);
 }
 
 }  // namespace edk
 }  // namespace mojo