IPC::Message Refactoring: Move POSIX specific bits to PlatformFileAttachment

ipc/ipc_channel_posix.cc

 // Copyright (c) 2012 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/ipc_channel_posix.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stddef.h>
 #include <sys/socket.h>
@@ skipping 24 matching lines @@
 #include "base/process/process_handle.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/synchronization/lock.h"
 #include "ipc/ipc_descriptors.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_message_attachment_set.h"
 #include "ipc/ipc_message_utils.h"
+#include "ipc/ipc_platform_file_attachment.h"
 #include "ipc/ipc_switches.h"
 #include "ipc/unix_domain_socket_util.h"
 
 namespace IPC {
 
 // IPC channels on Windows use named pipes (CreateNamedPipe()) with
 // channel ids as the pipe names.  Channels on POSIX use sockets as
 // pipes  These don't quite line up.
 //
 // When creating a child subprocess we use a socket pair and the parent side of
@@ skipping 731 matching lines @@
   // Create the Hello message
   scoped_ptr<Message> msg(new Message(MSG_ROUTING_NONE,
                                       HELLO_MESSAGE_TYPE,
                                       IPC::Message::PRIORITY_NORMAL));
   if (!msg->WriteInt(GetHelloMessageProcId())) {
     NOTREACHED() << "Unable to pickle hello message proc id";
   }
 #if defined(IPC_USES_READWRITE)
   scoped_ptr<Message> hello;
   if (remote_fd_pipe_.is_valid()) {
-    if (!msg->WriteBorrowingFile(remote_fd_pipe_.get())) {
+    if (!msg->WriteAttachment(
+            new internal::PlatformFileAttachment(remote_fd_pipe_.get()))) {
       NOTREACHED() << "Unable to pickle hello message file descriptors";
     }
     DCHECK_EQ(msg->attachment_set()->size(), 1U);
   }
 #endif  // IPC_USES_READWRITE
   output_queue_.push(msg.release());
 }
 
 ChannelPosix::ReadState ChannelPosix::ReadData(
     char* buffer,
@@ skipping 200 matching lines @@
       int pid;
       if (!iter.ReadInt(&pid))
         NOTREACHED();
 
 #if defined(IPC_USES_READWRITE)
       if (mode_ & MODE_SERVER_FLAG) {
         // With IPC_USES_READWRITE, the Hello message from the client to the
         // server also contains the fd_pipe_, which  will be used for all
         // subsequent file descriptor passing.
         DCHECK_EQ(msg.attachment_set()->size(), 1U);
-        base::ScopedFD descriptor;
-        if (!msg.ReadFile(&iter, &descriptor)) {
+        scoped_refptr<MessageAttachment> attachment;
+        if (!msg.ReadAttachment(&iter, &attachment)) {
           NOTREACHED();
         }
-        fd_pipe_.reset(descriptor.release());
+        fd_pipe_.reset(attachment->TakePlatformFile());
       }
 #endif  // IPC_USES_READWRITE
       peer_pid_ = pid;
       listener()->OnChannelConnected(pid);
       break;
 
 #if defined(OS_MACOSX)
     case Channel::CLOSE_FD_MESSAGE_TYPE:
       int fd, hops;
       if (!iter.ReadInt(&hops))
@@ skipping 95 matching lines @@
 }
 
 #if defined(OS_LINUX)
 // static
 void Channel::SetGlobalPid(int pid) {
   ChannelPosix::SetGlobalPid(pid);
 }
 #endif  // OS_LINUX
 
 }  // namespace IPC