Mojo: Make PlatformChannelRecvmsg() append handles to a deque instead.

mojo/embedder/platform_channel_utils_posix.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 "mojo/embedder/platform_channel_utils_posix.h"
 
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <unistd.h>
 
@@ skipping 87 matching lines @@
   }
 
   for (size_t i = 0; i < num_handles; i++)
     handles[i].CloseIfNecessary();
   return true;
 }
 
 ssize_t PlatformChannelRecvmsg(PlatformHandle h,
                                void* buf,
                                size_t num_bytes,
-                               ScopedPlatformHandleVectorPtr* handles) {
+                               std::deque<PlatformHandle>* platform_handles) {
   DCHECK(buf);
   DCHECK_GT(num_bytes, 0u);
-  DCHECK(handles);
+  DCHECK(platform_handles);
 
   struct iovec iov = { buf, num_bytes };
   char cmsg_buf[CMSG_SPACE(kPlatformChannelMaxNumHandles * sizeof(int))];
   struct msghdr msg = {};
   msg.msg_iov = &iov;
   msg.msg_iovlen = 1;
   msg.msg_control = cmsg_buf;
   msg.msg_controllen = sizeof(cmsg_buf);
 
   ssize_t result = HANDLE_EINTR(recvmsg(h.fd, &msg, MSG_DONTWAIT));
   if (result < 0)
     return result;
 
   // Success; no control messages.
   if (msg.msg_controllen == 0)
     return result;
 
   DCHECK(!(msg.msg_flags & MSG_CTRUNC));
 
   for (cmsghdr* cmsg = CMSG_FIRSTHDR(&msg);
        cmsg;
        cmsg = CMSG_NXTHDR(&msg, cmsg)) {
     if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) {
       size_t payload_length = cmsg->cmsg_len - CMSG_LEN(0);
       DCHECK_EQ(payload_length % sizeof(int), 0u);
       size_t num_fds = payload_length / sizeof(int);
       const int* fds = reinterpret_cast<int*>(CMSG_DATA(cmsg));
       for (size_t i = 0; i < num_fds; i++) {
-        if (!*handles)
-          (*handles).reset(new PlatformHandleVector());
-        (*handles)->push_back(PlatformHandle(fds[i]));
-        DCHECK((*handles)->back().is_valid());
+        platform_handles->push_back(PlatformHandle(fds[i]));
+        DCHECK(platform_handles->back().is_valid());
       }
     }
   }
 
   return result;
 }
 
 }  // namespace embedder
 }  // namespace mojo