Tighten up DEPS some more. NaCl/service process code are including internal content files. Fix the …

content/common/unix_domain_socket_posix.cc

Index: content/common/unix_domain_socket_posix.cc
===================================================================
--- content/common/unix_domain_socket_posix.cc	(revision 140304)
+++ content/common/unix_domain_socket_posix.cc	(working copy)
@@ -1,146 +0,0 @@
-// Copyright (c) 2011 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 "content/common/unix_domain_socket_posix.h"
-
-#include <errno.h>
-#include <unistd.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-
-#include "base/eintr_wrapper.h"
-#include "base/logging.h"
-#include "base/pickle.h"
-#include "base/stl_util.h"
-
-// static
-bool UnixDomainSocket::SendMsg(int fd,
-                               const void* buf,
-                               size_t length,
-                               const std::vector<int>& fds) {
-  struct msghdr msg;
-  memset(&msg, 0, sizeof(msg));
-  struct iovec iov = {const_cast<void*>(buf), length};
-  msg.msg_iov = &iov;
-  msg.msg_iovlen = 1;
-
-  char* control_buffer = NULL;
-  if (fds.size()) {
-    const unsigned control_len = CMSG_SPACE(sizeof(int) * fds.size());
-    control_buffer = new char[control_len];
-
-    struct cmsghdr *cmsg;
-    msg.msg_control = control_buffer;
-    msg.msg_controllen = control_len;
-    cmsg = CMSG_FIRSTHDR(&msg);
-    cmsg->cmsg_level = SOL_SOCKET;
-    cmsg->cmsg_type = SCM_RIGHTS;
-    cmsg->cmsg_len = CMSG_LEN(sizeof(int) * fds.size());
-    memcpy(CMSG_DATA(cmsg), &fds[0], sizeof(int) * fds.size());
-    msg.msg_controllen = cmsg->cmsg_len;
-  }
-
-  const ssize_t r = HANDLE_EINTR(sendmsg(fd, &msg, 0));
-  const bool ret = static_cast<ssize_t>(length) == r;
-  delete[] control_buffer;
-  return ret;
-}
-
-// static
-ssize_t UnixDomainSocket::RecvMsg(int fd,
-                                  void* buf,
-                                  size_t length,
-                                  std::vector<int>* fds) {
-  static const unsigned kMaxDescriptors = 16;
-
-  fds->clear();
-
-  struct msghdr msg;
-  memset(&msg, 0, sizeof(msg));
-  struct iovec iov = {buf, length};
-  msg.msg_iov = &iov;
-  msg.msg_iovlen = 1;
-
-  char control_buffer[CMSG_SPACE(sizeof(int) * kMaxDescriptors)];
-  msg.msg_control = control_buffer;
-  msg.msg_controllen = sizeof(control_buffer);
-
-  const ssize_t r = HANDLE_EINTR(recvmsg(fd, &msg, 0));
-  if (r == -1)
-    return -1;
-
-  int* wire_fds = NULL;
-  unsigned wire_fds_len = 0;
-
-  if (msg.msg_controllen > 0) {
-    struct cmsghdr* cmsg;
-    for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
-      if (cmsg->cmsg_level == SOL_SOCKET &&
-          cmsg->cmsg_type == SCM_RIGHTS) {
-        const unsigned payload_len = cmsg->cmsg_len - CMSG_LEN(0);
-        DCHECK(payload_len % sizeof(int) == 0);
-        wire_fds = reinterpret_cast<int*>(CMSG_DATA(cmsg));
-        wire_fds_len = payload_len / sizeof(int);
-        break;
-      }
-    }
-  }
-
-  if (msg.msg_flags & MSG_TRUNC || msg.msg_flags & MSG_CTRUNC) {
-    for (unsigned i = 0; i < wire_fds_len; ++i)
-      close(wire_fds[i]);
-    errno = EMSGSIZE;
-    return -1;
-  }
-
-  fds->resize(wire_fds_len);
-  memcpy(vector_as_array(fds), wire_fds, sizeof(int) * wire_fds_len);
-
-  return r;
-}
-
-// static
-ssize_t UnixDomainSocket::SendRecvMsg(int fd,
-                                      uint8_t* reply,
-                                      unsigned max_reply_len,
-                                      int* result_fd,
-                                      const Pickle& request) {
-  int fds[2];
-
-  // This socketpair is only used for the IPC and is cleaned up before
-  // returning.
-  if (socketpair(AF_UNIX, SOCK_DGRAM, 0, fds) == -1)
-      return false;
-
-  std::vector<int> fd_vector;
-  fd_vector.push_back(fds[1]);
-  if (!SendMsg(fd, request.data(), request.size(), fd_vector)) {
-    close(fds[0]);
-    close(fds[1]);
-    return -1;
-  }
-  close(fds[1]);
-
-  fd_vector.clear();
-  const ssize_t reply_len = RecvMsg(fds[0], reply, max_reply_len, &fd_vector);
-  close(fds[0]);
-  if (reply_len == -1)
-    return -1;
-
-  if ((!fd_vector.empty() && result_fd == NULL) || fd_vector.size() > 1) {
-    for (std::vector<int>::const_iterator
-         i = fd_vector.begin(); i != fd_vector.end(); ++i) {
-      close(*i);
-    }
-
-    NOTREACHED();
-
-    return -1;
-  }
-
-  if (result_fd)
-    *result_fd = fd_vector.empty() ? -1 : fd_vector[0];
-
-  return reply_len;
-}