Changing SpawnChild to return a struct.

mojo/edk/embedder/platform_handle.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/embedder/platform_handle.h"
 
 #include "build/build_config.h"
 #if defined(OS_POSIX)
 #include <unistd.h>
 #elif defined(OS_WIN)
 #include <windows.h>
 #else
 #error "Platform not yet supported."
 #endif
 
+#if defined(OS_ANDROID)
+#include "base/android/jni_android.h"
+#endif
+
 #include "base/logging.h"
 
 namespace mojo {
 namespace edk {
 
 void PlatformHandle::CloseIfNecessary() {
   if (!is_valid())
     return;
 
 #if defined(OS_POSIX)
   if (type == Type::POSIX) {
     bool success = (close(handle) == 0);
     DPCHECK(success);
     handle = -1;
   }
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   else if (type == Type::MACH) {
     kern_return_t rv = mach_port_deallocate(mach_task_self(), port);
     DPCHECK(rv == KERN_SUCCESS);
     port = MACH_PORT_NULL;
   }
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
+#if defined(OS_ANDROID)
+  else if (type == Type::PARCELABLE)
+    parcelable.Reset();
+#endif  // defined(OS_ANDROID)
 #elif defined(OS_WIN)
   if (owning_process != base::GetCurrentProcessHandle()) {
     // This handle may have been duplicated to a new target process but not yet
     // sent there. In this case CloseHandle should NOT be called. From MSDN
     // documentation for DuplicateHandle[1]:
     //
     //    Normally the target process closes a duplicated handle when that
     //    process is finished using the handle. To close a duplicated handle
     //    from the source process, call DuplicateHandle with the following
     //    parameters:
@@ skipping 17 matching lines @@
   bool success = !!CloseHandle(handle);
   DPCHECK(success);
   handle = INVALID_HANDLE_VALUE;
 #else
 #error "Platform not yet supported."
 #endif
 }
 
 }  // namespace edk
 }  // namespace mojo