IPC: Generalize FileDescriptorSet to MessageAttachmentSet

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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_logging.h"
+#include "ipc/ipc_message_attachment_set.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/mojo/client_channel.mojom.h"
 #include "ipc/mojo/ipc_mojo_bootstrap.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
 
-#if defined(OS_POSIX) && !defined(OS_NACL)
-#include "ipc/file_descriptor_set_posix.h"
-#endif
-
 namespace IPC {
 
 namespace {
 
 class MojoChannelFactory : public ChannelFactory {
  public:
   MojoChannelFactory(ChannelMojo::Delegate* delegate,
                      ChannelHandle channel_handle,
                      Channel::Mode mode)
       : delegate_(delegate), channel_handle_(channel_handle), mode_(mode) {}
@@ skipping 303 matching lines @@
 #if defined(OS_POSIX) && !defined(OS_NACL)
 int ChannelMojo::GetClientFileDescriptor() const {
   return bootstrap_->GetClientFileDescriptor();
 }
 
 base::ScopedFD ChannelMojo::TakeClientFileDescriptor() {
   return bootstrap_->TakeClientFileDescriptor();
 }
 
 // static
-MojoResult ChannelMojo::WriteToFileDescriptorSet(
+MojoResult ChannelMojo::WriteToMessageAttachmentSet(
     const std::vector<MojoHandle>& handle_buffer,
     Message* message) {
   for (size_t i = 0; i < handle_buffer.size(); ++i) {
     mojo::embedder::ScopedPlatformHandle platform_handle;
     MojoResult unwrap_result = mojo::embedder::PassWrappedPlatformHandle(
         handle_buffer[i], &platform_handle);
     if (unwrap_result != MOJO_RESULT_OK) {
       DLOG(WARNING) << "Pipe failed to covert handles. Closing: "
                     << unwrap_result;
       return unwrap_result;
     }
 
-    bool ok = message->file_descriptor_set()->AddToOwn(
+    bool ok = message->attachment_set()->AddToOwn(
         base::ScopedFD(platform_handle.release().fd));
     DCHECK(ok);
   }
 
   return MOJO_RESULT_OK;
 }
 
 // static
-MojoResult ChannelMojo::ReadFromFileDescriptorSet(
+MojoResult ChannelMojo::ReadFromMessageAttachmentSet(
     Message* message,
     std::vector<MojoHandle>* handles) {
   // We dup() the handles in IPC::Message to transmit.
-  // IPC::FileDescriptorSet has intricate lifecycle semantics
+  // IPC::MessageAttachmentSet has intricate lifecycle semantics
   // of FDs, so just to dup()-and-own them is the safest option.
   if (message->HasFileDescriptors()) {
-    FileDescriptorSet* fdset = message->file_descriptor_set();
+    MessageAttachmentSet* fdset = message->attachment_set();
     std::vector<base::PlatformFile> fds_to_send(fdset->size());
     fdset->PeekDescriptors(&fds_to_send[0]);
     for (size_t i = 0; i < fds_to_send.size(); ++i) {
       int fd_to_send = dup(fds_to_send[i]);
       if (-1 == fd_to_send) {
         DPLOG(WARNING) << "Failed to dup FD to transmit.";
         fdset->CommitAll();
         return MOJO_RESULT_UNKNOWN;
       }
 
@@ skipping 14 matching lines @@
 
     fdset->CommitAll();
   }
 
   return MOJO_RESULT_OK;
 }
 
 #endif  // defined(OS_POSIX) && !defined(OS_NACL)
 
 }  // namespace IPC