Explicitly serialise platform file attachments instead of doing them implicitly as a mojo handle at…

ipc/mojo/ipc_channel_mojo.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 "ipc/mojo/ipc_channel_mojo.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 97 matching lines @@
     // of FDs, so just to dup()-and-own them is the safest option.
     base::ScopedFD file = TakeOrDupFile(
         static_cast<IPC::internal::PlatformFileAttachment*>(attachment));
     if (!file.is_valid()) {
       DPLOG(WARNING) << "Failed to dup FD to transmit.";
       return MOJO_RESULT_UNKNOWN;
     }
 
     return WrapPlatformHandle(mojo::edk::ScopedPlatformHandle(
                                   mojo::edk::PlatformHandle(file.release())),
-                              mojom::SerializedHandle::Type::MOJO_HANDLE,
+                              mojom::SerializedHandle::Type::PLATFORM_FILE,
                               serialized);
   }
 #endif
 #if defined(OS_MACOSX)
   DCHECK_EQ(attachment->GetType(),
             MessageAttachment::TYPE_BROKERABLE_ATTACHMENT);
   DCHECK_EQ(static_cast<BrokerableAttachment&>(*attachment).GetBrokerableType(),
             BrokerableAttachment::MACH_PORT);
   internal::MachPortAttachmentMac& mach_port_attachment =
       static_cast<internal::MachPortAttachmentMac&>(*attachment);
@@ skipping 39 matching lines @@
   if (handle->type == mojom::SerializedHandle::Type::MOJO_HANDLE) {
     *attachment =
         new IPC::internal::MojoHandleAttachment(std::move(handle->the_handle));
     return MOJO_RESULT_OK;
   }
   mojo::edk::ScopedPlatformHandle platform_handle;
   MojoResult unwrap_result = mojo::edk::PassWrappedPlatformHandle(
           handle->the_handle.release().value(), &platform_handle);
   if (unwrap_result != MOJO_RESULT_OK)
     return unwrap_result;
+#if defined(OS_POSIX)
+  if (handle->type == mojom::SerializedHandle::Type::PLATFORM_FILE &&
+      platform_handle.get().type == mojo::edk::PlatformHandle::Type::POSIX) {
+    *attachment = new internal::PlatformFileAttachment(
+        platform_handle.release().handle);
+    return MOJO_RESULT_OK;
+  }
+#endif  // defined(OS_POSIX)
 #if defined(OS_MACOSX)
   if (handle->type == mojom::SerializedHandle::Type::MACH_PORT &&
       platform_handle.get().type == mojo::edk::PlatformHandle::Type::MACH) {
     *attachment = new internal::MachPortAttachmentMac(
         platform_handle.release().port,
         internal::MachPortAttachmentMac::FROM_WIRE);
     return MOJO_RESULT_OK;
   }
 #endif  // defined(OS_MACOSX)
 #if defined(OS_WIN)
@@ skipping 248 matching lines @@
     DCHECK(ok);
     if (!ok) {
       LOG(ERROR) << "Failed to add new Mojo handle.";
       return MOJO_RESULT_UNKNOWN;
     }
   }
   return MOJO_RESULT_OK;
 }
 
 }  // namespace IPC