Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Unified Diff: content/browser/zygote_host/zygote_host_impl_linux.cc

Issue 258543006: Change UnixDomainSocket::RecvMsg to return ScopedVector<base::ScopedFD> (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and resolve conflicts with r266735 Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/sandbox_ipc_linux.cc ('k') | content/zygote/zygote_linux.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/zygote_host/zygote_host_impl_linux.cc
diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc
index a56d646f7efb3a0470f682afb8e087e5f4da683e..cb6545b4527f866cd86db88aec769861b4d8573a 100644
--- a/content/browser/zygote_host/zygote_host_impl_linux.cc
+++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
@@ -20,6 +20,7 @@
#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"
@@ -176,7 +177,7 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
// 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(
« no previous file with comments | « content/browser/renderer_host/sandbox_ipc_linux.cc ('k') | content/zygote/zygote_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698