IPC: Get rid of FileDescriptor usage from FileDescriptorSet and Message

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"
@@ skipping 230 matching lines @@
   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()->Add(platform_handle.release().fd);
+    bool ok = message->file_descriptor_set()->AddToOwn(
+        base::ScopedFD(platform_handle.release().fd));
     DCHECK(ok);
   }
 
   return MOJO_RESULT_OK;
 }
 
 // static
 MojoResult ChannelMojo::ReadFromFileDescriptorSet(
-    const Message& message,
+    Message* message,
     std::vector<MojoHandle>* handles) {
   // We dup() the handles in IPC::Message to transmit.
   // IPC::FileDescriptorSet has intricate lifecycle semantics
   // of FDs, so just to dup()-and-own them is the safest option.
-  if (message.HasFileDescriptors()) {
-    const FileDescriptorSet* fdset = message.file_descriptor_set();
-    for (size_t i = 0; i < fdset->size(); ++i) {
-      int fd_to_send = dup(fdset->GetDescriptorAt(i));
+  if (message->HasFileDescriptors()) {
+    FileDescriptorSet* fdset = message->file_descriptor_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;
       }
 
       MojoHandle wrapped_handle;
       MojoResult wrap_result = CreatePlatformHandleWrapper(
           mojo::embedder::ScopedPlatformHandle(
               mojo::embedder::PlatformHandle(fd_to_send)),
           &wrapped_handle);
       if (MOJO_RESULT_OK != wrap_result) {
         DLOG(WARNING) << "Pipe failed to wrap handles. Closing: "
                       << wrap_result;
+        fdset->CommitAll();
         return wrap_result;
       }
 
       handles->push_back(wrapped_handle);
     }
+
+    fdset->CommitAll();
   }
 
   return MOJO_RESULT_OK;
 }
 
 #endif  // defined(OS_POSIX) && !defined(OS_NACL)
 
 }  // namespace IPC