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

Unified Diff: content/zygote/zygote_linux.h

Issue 1149113006: Move Pickle to base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/public/common/common_param_traits.h ('k') | crypto/secure_hash.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/zygote/zygote_linux.h
diff --git a/content/zygote/zygote_linux.h b/content/zygote/zygote_linux.h
index 80d4a2933b53afa03c0af29f200ae927ecf51892..d371e12a3096919e026072398e3b0b918f600d6a 100644
--- a/content/zygote/zygote_linux.h
+++ b/content/zygote/zygote_linux.h
@@ -16,8 +16,10 @@
#include "base/process/kill.h"
#include "base/process/process.h"
+namespace base {
class Pickle;
class PickleIterator;
+}
namespace content {
@@ -63,7 +65,7 @@ class Zygote {
// new process and thus need to unwind back into ChromeMain.
bool HandleRequestFromBrowser(int fd);
- void HandleReapRequest(int fd, PickleIterator iter);
+ void HandleReapRequest(int fd, base::PickleIterator iter);
// Get the termination status of |real_pid|. |real_pid| is the PID as it
// appears outside of the sandbox.
@@ -74,7 +76,7 @@ class Zygote {
int* exit_code);
void HandleGetTerminationStatus(int fd,
- PickleIterator iter);
+ base::PickleIterator iter);
// This is equivalent to fork(), except that, when using the SUID sandbox, it
// returns the real PID of the child process as it appears outside the
@@ -95,7 +97,7 @@ class Zygote {
// Unpacks process type and arguments from |iter| 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(base::PickleIterator iter,
ScopedVector<base::ScopedFD> fds,
std::string* uma_name,
int* uma_sample,
@@ -106,11 +108,11 @@ class Zygote {
// otherwise writes the child_pid back to the browser via |fd|. Writes a
// child_pid of -1 on error.
bool HandleForkRequest(int fd,
- PickleIterator iter,
+ base::PickleIterator iter,
ScopedVector<base::ScopedFD> fds);
bool HandleGetSandboxStatus(int fd,
- PickleIterator iter);
+ base::PickleIterator iter);
// The Zygote needs to keep some information about each process. Most
// notably what the PID of the process is inside the PID namespace of
« no previous file with comments | « content/public/common/common_param_traits.h ('k') | crypto/secure_hash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698