| Index: ipc/ipc_channel.h
|
| diff --git a/ipc/ipc_channel.h b/ipc/ipc_channel.h
|
| index f6bd5044c14af5150e12a9a964a382d7d630c4cc..71e5b79ba42a9cd8b707ffa9242351c5ce040c89 100644
|
| --- a/ipc/ipc_channel.h
|
| +++ b/ipc/ipc_channel.h
|
| @@ -179,7 +179,8 @@ class IPC_EXPORT Channel : public Sender {
|
| // deleted once the contents of the Message have been sent.
|
| virtual bool Send(Message* message) = 0;
|
|
|
| -#if defined(OS_POSIX) && !defined(OS_NACL)
|
| +#if defined(OS_POSIX) && \
|
| + (!defined(OS_NACL) || defined(__native_client_nonsfi__))
|
| // On POSIX an IPC::Channel wraps a socketpair(), this method returns the
|
| // FD # for the client end of the socket.
|
| // This method may only be called on the server side of a channel.
|
| @@ -190,13 +191,13 @@ class IPC_EXPORT Channel : public Sender {
|
| // file descriptor to the caller.
|
| // This method can be called on any thread.
|
| virtual int TakeClientFileDescriptor() = 0;
|
| -#endif // defined(OS_POSIX) && !defined(OS_NACL)
|
| +#endif
|
|
|
| // Returns true if a named server channel is initialized on the given channel
|
| // ID. Even if true, the server may have already accepted a connection.
|
| static bool IsNamedServerInitialized(const std::string& channel_id);
|
|
|
| -#if !defined(OS_NACL)
|
| +#if !defined(OS_NACL) || defined(__native_client_nonsfi__)
|
| // Generates a channel ID that's non-predictable and unique.
|
| static std::string GenerateUniqueRandomChannelID();
|
|
|
| @@ -207,7 +208,7 @@ class IPC_EXPORT Channel : public Sender {
|
| static std::string GenerateVerifiedChannelID(const std::string& prefix);
|
| #endif
|
|
|
| -#if defined(OS_LINUX)
|
| +#if defined(OS_LINUX) || defined(__native_client_nonsfi__)
|
| // Sandboxed processes live in a PID namespace, so when sending the IPC hello
|
| // message from client to server we need to send the PID from the global
|
| // PID namespace.
|
|
|