Index: content/zygote/zygote_linux.h |
diff --git a/content/zygote/zygote_linux.h b/content/zygote/zygote_linux.h |
index 41773fa474b94f1db97b862523ac809e2f5f256c..f93ea03556470eed2b958bba10181d9ce9e43ee0 100644 |
--- a/content/zygote/zygote_linux.h |
+++ b/content/zygote/zygote_linux.h |
@@ -61,7 +61,7 @@ |
// new process and thus need to unwind back into ChromeMain. |
bool HandleRequestFromBrowser(int fd); |
- void HandleReapRequest(int fd, PickleIterator iter); |
+ void HandleReapRequest(int fd, const Pickle& pickle, PickleIterator iter); |
// Get the termination status of |real_pid|. |real_pid| is the PID as it |
// appears outside of the sandbox. |
@@ -72,6 +72,7 @@ |
int* exit_code); |
void HandleGetTerminationStatus(int fd, |
+ const Pickle& pickle, |
PickleIterator iter); |
// This is equivalent to fork(), except that, when using the SUID sandbox, it |
@@ -90,10 +91,11 @@ |
int* uma_sample, |
int* uma_boundary_value); |
- // Unpacks process type and arguments from |iter| and forks a new process. |
+ // Unpacks process type and arguments from |pickle| and forks a new process. |
// 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(PickleIterator iter, |
+ base::ProcessId ReadArgsAndFork(const Pickle& pickle, |
+ PickleIterator iter, |
ScopedVector<base::ScopedFD> fds, |
std::string* uma_name, |
int* uma_sample, |
@@ -104,10 +106,12 @@ |
// otherwise writes the child_pid back to the browser via |fd|. Writes a |
// child_pid of -1 on error. |
bool HandleForkRequest(int fd, |
+ const Pickle& pickle, |
PickleIterator iter, |
ScopedVector<base::ScopedFD> fds); |
bool HandleGetSandboxStatus(int fd, |
+ const Pickle& pickle, |
PickleIterator iter); |
// The Zygote needs to keep some information about each process. Most |