GC server_listen_pipe_

jld · Jan 10, 2020 · 7140d65 · 7140d65
1 parent eaed5f8
commit 7140d65
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/ipc/chromium/src/chrome/common/ipc_channel_posix.cc b/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
@@ -149,7 +149,6 @@ void Channel::ChannelImpl::Init(Mode mode, Listener* listener) {
   is_blocked_on_write_ = false;
   partial_write_iter_.reset();
   input_buf_offset_ = 0;
-  server_listen_pipe_ = -1;
   pipe_ = -1;
   client_pipe_ = -1;
   listener_ = listener;
@@ -163,7 +162,7 @@ void Channel::ChannelImpl::Init(Mode mode, Listener* listener) {
 }
 
 bool Channel::ChannelImpl::CreatePipe(Mode mode) {
-  DCHECK(server_listen_pipe_ == -1 && pipe_ == -1);
+  DCHECK(pipe_ == -1);
 
   if (mode == MODE_SERVER) {
     // socketpair()
@@ -774,11 +773,6 @@ void Channel::ChannelImpl::Close() {
   // Unregister libevent for the listening socket and close it.
   server_listen_connection_watcher_.StopWatchingFileDescriptor();
 
-  if (server_listen_pipe_ != -1) {
-    IGNORE_EINTR(close(server_listen_pipe_));
-    server_listen_pipe_ = -1;
-  }
-
   // Unregister libevent for the FIFO and close it.
   read_watcher_.StopWatchingFileDescriptor();
   write_watcher_.StopWatchingFileDescriptor();

diff --git a/ipc/chromium/src/chrome/common/ipc_channel_posix.h b/ipc/chromium/src/chrome/common/ipc_channel_posix.h
@@ -89,7 +89,6 @@ class Channel::ChannelImpl : public MessageLoopForIO::Watcher {
   // sending.
   mozilla::Maybe<Pickle::BufferList::IterImpl> partial_write_iter_;
 
-  int server_listen_pipe_;
   int pipe_;
   int client_pipe_;  // The client end of our socketpair().