Change UnixDomainSocket::RecvMsg to return ScopedVector<base::ScopedFD>

content/browser/zygote_host/zygote_host_impl_linux.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 "content/browser/zygote_host/zygote_host_impl_linux.h"
 
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/scoped_file.h"
 #include "base/linux_util.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/posix/unix_domain_socket_linux.h"
 #include "base/process/launch.h"
 #include "base/process/memory.h"
 #include "base/process/process_handle.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 136 matching lines @@
   base::LaunchProcess(cmd_line.argv(), options, &process);
   CHECK(process != -1) << "Failed to launch zygote process";
   dummy_fd.reset();
 
   if (using_suid_sandbox_) {
     // In the SUID sandbox, the real zygote is forked from the sandbox
     // and will be executing in another PID namespace.
     // Wait for the zygote to tell us it's running, and receive its PID,
     // which the kernel will translate to our PID namespace.
     // The sending code is in content/browser/zygote_main_linux.cc.
-    std::vector<int> fds_vec;
+    ScopedVector<base::ScopedFD> fds_vec;
     const size_t kExpectedLength = sizeof(kZygoteHelloMessage);
     char buf[kExpectedLength];
     const ssize_t len = UnixDomainSocket::RecvMsgWithPid(
         fds[0], buf, sizeof(buf), &fds_vec, &pid_);
     CHECK_EQ(kExpectedLength, static_cast<size_t>(len))
         << "Incorrect zygote magic length";
     CHECK_EQ(0, memcmp(buf, kZygoteHelloMessage, kExpectedLength))
         << "Incorrect zygote hello";
     CHECK_EQ(0U, fds_vec.size())
         << "Zygote hello should not include file descriptors";
@@ skipping 332 matching lines @@
   return RenderSandboxHostLinux::GetInstance()->pid();
 }
 
 int ZygoteHostImpl::GetSandboxStatus() const {
   if (have_read_sandbox_status_word_)
     return sandbox_status_;
   return 0;
 }
 
 }  // namespace content