| Index: content/browser/zygote_host_linux.cc
|
| diff --git a/content/browser/zygote_host_linux.cc b/content/browser/zygote_host_linux.cc
|
| index 4a514362c0307b9a2ff4a1699a9e1ab1ddb9d5b7..23008ee2edb96e1363b8d8fb85427adb303e06db 100644
|
| --- a/content/browser/zygote_host_linux.cc
|
| +++ b/content/browser/zygote_host_linux.cc
|
| @@ -216,13 +216,18 @@ ssize_t ZygoteHost::ReadReply(void* buf, size_t buf_len) {
|
| return HANDLE_EINTR(read(control_fd_, buf, buf_len));
|
| }
|
|
|
| -pid_t ZygoteHost::ForkRenderer(
|
| +pid_t ZygoteHost::ForkRequest(
|
| const std::vector<std::string>& argv,
|
| - const base::GlobalDescriptors::Mapping& mapping) {
|
| + const base::GlobalDescriptors::Mapping& mapping,
|
| + const std::string& process_type) {
|
| DCHECK(init_);
|
| Pickle pickle;
|
|
|
| - pickle.WriteInt(kCmdFork);
|
| + if (process_type == switches::kNaClLoaderProcess) {
|
| + pickle.WriteInt(kCmdNaClFork);
|
| + } else {
|
| + pickle.WriteInt(kCmdFork);
|
| + }
|
| pickle.WriteInt(argv.size());
|
| for (std::vector<std::string>::const_iterator
|
| i = argv.begin(); i != argv.end(); ++i)
|
|
|