content/zygote/zygote_linux.h - Issue 1508213002: Replace ScopedVector<ScopedFD> with std::vector<ScopedFD>

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/zygote/zygote_linux.h

Issue 1508213002: Replace ScopedVector<ScopedFD> with std::vector<ScopedFD> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: revert gratuitous .at(0) change back to [0] Created 5 years 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

« content/browser/file_descriptor_info_impl.cc ('K') | « content/browser/zygote_host/zygote_host_impl_linux.cc ('k') | content/zygote/zygote_linux.cc » ('j') | sandbox/linux/integration_tests/namespace_unix_domain_socket_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/zygote/zygote_linux.h

diff --git a/content/zygote/zygote_linux.h b/content/zygote/zygote_linux.h

index f96b906d03673639efab78f4c2c91de347c720f9..b1eecd600867dc17b92a804dfd22f5ef2e865ff6 100644

--- a/content/zygote/zygote_linux.h

+++ b/content/zygote/zygote_linux.h

@@ -8,6 +8,7 @@

#include <stddef.h>

#include <string>

+#include <vector>

#include "base/containers/small_map.h"

#include "base/files/scoped_file.h"

@@ -104,7 +105,7 @@ class Zygote {

// Returns -1 on error, otherwise returns twice, returning 0 to the child

// process and the child process ID to the parent process, like fork().

base::ProcessId ReadArgsAndFork(base::PickleIterator iter,

- ScopedVector<base::ScopedFD> fds,

+ std::vector<base::ScopedFD> fds,

std::string* uma_name,

int* uma_sample,

int* uma_boundary_value);

@@ -115,7 +116,7 @@ class Zygote {

// child_pid of -1 on error.

bool HandleForkRequest(int fd,

base::PickleIterator iter,

- ScopedVector<base::ScopedFD> fds);

+ std::vector<base::ScopedFD> fds);

bool HandleGetSandboxStatus(int fd,

base::PickleIterator iter);