Index: ipc/ipc_channel_posix.cc |
diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc |
index f93a003b8cad173d26f2ad4941c63c9f6f95b88f..c347b15c9e55ab4b5714df9f14d813f785baa89e 100644 |
--- a/ipc/ipc_channel_posix.cc |
+++ b/ipc/ipc_channel_posix.cc |
@@ -189,7 +189,6 @@ |
waiting_connect_(true), |
message_send_bytes_written_(0), |
pipe_name_(channel_handle.name), |
- in_dtor_(false), |
must_unlink_(false) { |
memset(input_cmsg_buf_, 0, sizeof(input_cmsg_buf_)); |
if (!CreatePipe(channel_handle)) { |
@@ -201,7 +200,6 @@ |
} |
ChannelPosix::~ChannelPosix() { |
- in_dtor_ = true; |
Close(); |
} |
@@ -613,7 +611,7 @@ |
// Unregister libevent for the unix domain socket and close it. |
read_watcher_.StopWatchingFileDescriptor(); |
write_watcher_.StopWatchingFileDescriptor(); |
- ResetSafely(&pipe_); |
+ pipe_.reset(); |
#if defined(IPC_USES_READWRITE) |
fd_pipe_.reset(); |
remote_fd_pipe_.reset(); |
@@ -1080,23 +1078,6 @@ |
return GetHelloMessageProcId(); |
} |
-void ChannelPosix::ResetSafely(base::ScopedFD* fd) { |
- if (!in_dtor_) { |
- fd->reset(); |
- return; |
- } |
- |
- // crbug.com/449233 |
- // The CL [1] tightened the error check for closing FDs, but it turned |
- // out that there are existing cases that hit the newly added check. |
- // ResetSafely() is the workaround for that crash, turning it from |
- // from PCHECK() to DPCHECK() so that it doesn't crash in production. |
- // [1] https://crrev.com/ce44fef5fd60dd2be5c587d4b084bdcd36adcee4 |
- int fd_to_close = fd->release(); |
- if (-1 != fd_to_close) |
- DPCHECK(0 == IGNORE_EINTR(close(fd_to_close))); |
-} |
- |
//------------------------------------------------------------------------------ |
// Channel's methods |