Index: ipc/ipc_channel_posix.cc |
=================================================================== |
--- ipc/ipc_channel_posix.cc (revision 66367) |
+++ ipc/ipc_channel_posix.cc (working copy) |
@@ -273,9 +273,8 @@ |
: mode_(mode), |
is_blocked_on_write_(false), |
message_send_bytes_written_(0), |
- uses_fifo_( |
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kIPCUseFIFO) || |
- mode == MODE_NAMED_SERVER || mode == MODE_NAMED_CLIENT), |
+ uses_fifo_(CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kIPCUseFIFO)), |
server_listen_pipe_(-1), |
pipe_(-1), |
client_pipe_(-1), |
@@ -286,15 +285,10 @@ |
listener_(listener), |
waiting_connect_(true), |
factory_(this) { |
- if (mode_ == MODE_NAMED_SERVER) |
- mode_ = MODE_SERVER; |
- if (mode_ == MODE_NAMED_CLIENT) |
- mode_ = MODE_CLIENT; |
- |
- if (!CreatePipe(channel_id, mode_)) { |
+ if (!CreatePipe(channel_id, mode)) { |
// The pipe may have been closed already. |
PLOG(WARNING) << "Unable to create pipe named \"" << channel_id |
- << "\" in " << (mode_ == MODE_SERVER ? "server" : "client") |
+ << "\" in " << (mode == MODE_SERVER ? "server" : "client") |
<< " mode"; |
} |
} |
@@ -352,7 +346,7 @@ |
// TODO(playmobil): We shouldn't need to create fifos on disk. |
// TODO(playmobil): If we do, they should be in the user data directory. |
// TODO(playmobil): Cleanup any stale fifos. |
- pipe_name_ = channel_id; |
+ pipe_name_ = "/var/tmp/chrome_" + channel_id; |
if (mode == MODE_SERVER) { |
if (!CreateServerFifo(pipe_name_, &server_listen_pipe_)) { |
return false; |