| Index: content/zygote/zygote_linux.h
|
| diff --git a/content/zygote/zygote_linux.h b/content/zygote/zygote_linux.h
|
| index 140dfa6735aa4fd50b48168fb6312c00b986c49b..4aa2f03d3bfbf8b2bc23706d5d53ec3b37b7db6f 100644
|
| --- a/content/zygote/zygote_linux.h
|
| +++ b/content/zygote/zygote_linux.h
|
| @@ -6,9 +6,10 @@
|
| #define CONTENT_ZYGOTE_ZYGOTE_H_
|
|
|
| #include <string>
|
| -#include <vector>
|
|
|
| #include "base/containers/small_map.h"
|
| +#include "base/files/scoped_file.h"
|
| +#include "base/memory/scoped_vector.h"
|
| #include "base/posix/global_descriptors.h"
|
| #include "base/process/kill.h"
|
| #include "base/process/process.h"
|
| @@ -89,7 +90,7 @@ class Zygote {
|
| // process and the child process ID to the parent process, like fork().
|
| base::ProcessId ReadArgsAndFork(const Pickle& pickle,
|
| PickleIterator iter,
|
| - std::vector<int>& fds,
|
| + ScopedVector<base::ScopedFD> fds,
|
| std::string* uma_name,
|
| int* uma_sample,
|
| int* uma_boundary_value);
|
| @@ -101,7 +102,7 @@ class Zygote {
|
| bool HandleForkRequest(int fd,
|
| const Pickle& pickle,
|
| PickleIterator iter,
|
| - std::vector<int>& fds);
|
| + ScopedVector<base::ScopedFD> fds);
|
|
|
| bool HandleGetSandboxStatus(int fd,
|
| const Pickle& pickle,
|
|
|