Revert "Delay Channel::OnError() in case of kDisconnected during Write()."

This reverts commit e9605182.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 542634 as the
culprit for failures in the build cycles as shown on:
https://findit-for-me.appspot.com/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtL2U5NjA1MTgyNTE4Njc4NDVlZDIzYmYyYWI4ZjA0MmE3N2FmZTE4ODUM

Sample Failed Build: https://ci.chromium.org/buildbot/chromium.memory/Linux%20MSan%20Tests/8479

Sample Failed Step: mojo_unittests

Original change's description:
> Delay Channel::OnError() in case of kDisconnected during Write().
> 
> Write() operations to a Channel can fail due to the peer having closed
> it, while there are still messages waiting to be read from it. We must
> therefore defer notifying the caller of the Channel::Error until we
> observe end-of-stream via a readable notification, otherwise those
> messages may be dropped (depending on whether the posted OnError task
> is processed before or after a pending Channel-readable event).
> 
> Bug: 816620
> Change-Id: I75bd34a48edf4022809d27ce49f9cfba7a5d4daf
> Reviewed-on: https://chromium-review.googlesource.com/956932
> Commit-Queue: Wez <wez@chromium.org>
> Reviewed-by: Ken Rockot <rockot@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#542634}

Change-Id: I9d212ecb8dde1e90422b60e950547e823357f0d4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 816620
Reviewed-on: https://chromium-review.googlesource.com/959761
Cr-Commit-Position: refs/heads/master@{#542698}

mojo/edk/system/channel_fuchsia.cc

@@ -201,14 +201,14 @@ class ChannelFuchsia : public Channel,
       StartOnIOThread();
     } else {
       io_task_runner_->PostTask(
-          FROM_HERE, base::BindOnce(&ChannelFuchsia::StartOnIOThread, this));
+          FROM_HERE, base::Bind(&ChannelFuchsia::StartOnIOThread, this));
     }
   }
 
   void ShutDownImpl() override {
     // Always shut down asynchronously when called through the public interface.
     io_task_runner_->PostTask(
-        FROM_HERE, base::BindOnce(&ChannelFuchsia::ShutDownOnIOThread, this));
+        FROM_HERE, base::Bind(&ChannelFuchsia::ShutDownOnIOThread, this));
   }
 
   void Write(MessagePtr message) override {
@@ -221,11 +221,11 @@ class ChannelFuchsia : public Channel,
         reject_writes_ = write_error = true;
     }
     if (write_error) {
-      // Do not synchronously invoke OnWriteError(). Write() may have been
-      // called by the delegate and we don't want to re-enter it.
+      // Do not synchronously invoke OnError(). Write() may have been called by
+      // the delegate and we don't want to re-enter it.
       io_task_runner_->PostTask(
-          FROM_HERE, base::BindOnce(&ChannelFuchsia::OnWriteError, this,
-                                    Error::kDisconnected));
+          FROM_HERE,
+          base::Bind(&ChannelFuchsia::OnError, this, Error::kDisconnected));
     }
   }
 
@@ -410,24 +410,6 @@ class ChannelFuchsia : public Channel,
     return true;
   }
 
-  void OnWriteError(Error error) {
-    DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
-    DCHECK(reject_writes_);
-
-    if (error == Error::kDisconnected) {
-      // If we can't write because the pipe is disconnected then continue
-      // reading to fetch any in-flight messages, relying on end-of-stream to
-      // signal the actual disconnection.
-      if (read_watch_) {
-        // TODO: When we add flow-control for writes, we also need to reset the
-        // write-watcher here.
-        return;
-      }
-    }
-
-    OnError(error);
-  }
-
   // Keeps the Channel alive at least until explicit shutdown on the IO thread.
   scoped_refptr<Channel> self_;
 

mojo/edk/system/channel_posix.cc

@@ -105,14 +105,14 @@ class ChannelPosix : public Channel,
       StartOnIOThread();
     } else {
       io_task_runner_->PostTask(
-          FROM_HERE, base::BindOnce(&ChannelPosix::StartOnIOThread, this));
+          FROM_HERE, base::Bind(&ChannelPosix::StartOnIOThread, this));
     }
   }
 
   void ShutDownImpl() override {
     // Always shut down asynchronously when called through the public interface.
     io_task_runner_->PostTask(
-        FROM_HERE, base::BindOnce(&ChannelPosix::ShutDownOnIOThread, this));
+        FROM_HERE, base::Bind(&ChannelPosix::ShutDownOnIOThread, this));
   }
 
   void Write(MessagePtr message) override {
@@ -129,11 +129,11 @@ class ChannelPosix : public Channel,
       }
     }
     if (write_error) {
-      // Invoke OnWriteError() asynchronously on the IO thread, in case Write()
-      // was called by the delegate, in which case we should not re-enter it.
+      // Do not synchronously invoke OnError(). Write() may have been called by
+      // the delegate and we don't want to re-enter it.
       io_task_runner_->PostTask(
-          FROM_HERE, base::BindOnce(&ChannelPosix::OnWriteError, this,
-                                    Error::kDisconnected));
+          FROM_HERE,
+          base::Bind(&ChannelPosix::OnError, this, Error::kDisconnected));
     }
   }
 
@@ -243,8 +243,7 @@ class ChannelPosix : public Channel,
           base::MessageLoopForIO::WATCH_WRITE, write_watcher_.get(), this);
     } else {
       io_task_runner_->PostTask(
-          FROM_HERE,
-          base::BindOnce(&ChannelPosix::WaitForWriteOnIOThread, this));
+          FROM_HERE, base::Bind(&ChannelPosix::WaitForWriteOnIOThread, this));
     }
   }
 
@@ -341,7 +340,7 @@ class ChannelPosix : public Channel,
         reject_writes_ = write_error = true;
     }
     if (write_error)
-      OnWriteError(Error::kDisconnected);
+      OnError(Error::kDisconnected);
   }
 
   // Attempts to write a message directly to the channel. If the full message
@@ -525,23 +524,6 @@ class ChannelPosix : public Channel,
   }
 #endif  // defined(OS_MACOSX)
 
-  void OnWriteError(Error error) {
-    DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
-    DCHECK(reject_writes_);
-
-    if (error == Error::kDisconnected) {
-      // If we can't write because the pipe is disconnected then continue
-      // reading to fetch any in-flight messages, relying on end-of-stream to
-      // signal the actual disconnection.
-      if (read_watcher_) {
-        write_watcher_.reset();
-        return;
-      }
-    }
-
-    OnError(error);
-  }
-
   // Keeps the Channel alive at least until explicit shutdown on the IO thread.
   scoped_refptr<Channel> self_;
 

mojo/edk/system/channel_unittest.cc

@@ -3,11 +3,7 @@
 // found in the LICENSE file.
 
 #include "mojo/edk/system/channel.h"
-
-#include "base/bind.h"
 #include "base/memory/ptr_util.h"
-#include "base/threading/thread.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -176,101 +172,6 @@ TEST(ChannelTest, OnReadNonLegacyMessage) {
                   channel_delegate.GetReceivedPayloadSize());
 }
 
-class ChannelTestShutdownAndWriteDelegate : public Channel::Delegate {
- public:
-  ChannelTestShutdownAndWriteDelegate(
-      ScopedPlatformHandle handle,
-      scoped_refptr<base::TaskRunner> task_runner,
-      scoped_refptr<Channel> client_channel,
-      std::unique_ptr<base::Thread> client_thread,
-      base::RepeatingClosure quit_closure)
-      : quit_closure_(std::move(quit_closure)),
-        client_channel_(std::move(client_channel)),
-        client_thread_(std::move(client_thread)) {
-    channel_ = Channel::Create(
-        this, ConnectionParams(TransportProtocol::kLegacy, std::move(handle)),
-        std::move(task_runner));
-    channel_->Start();
-  }
-  ~ChannelTestShutdownAndWriteDelegate() override { channel_->ShutDown(); }
-
-  // Channel::Delegate implementation
-  void OnChannelMessage(const void* payload,
-                        size_t payload_size,
-                        std::vector<ScopedPlatformHandle> handles) override {
-    ++message_count_;
-
-    // If |client_channel_| exists then close it and its thread.
-    if (client_channel_) {
-      // Write a fresh message, making our channel readable again.
-      Channel::MessagePtr message = std::make_unique<Channel::Message>(1, 0);
-      client_thread_->task_runner()->PostTask(
-          FROM_HERE, base::BindOnce(&Channel::Write, client_channel_,
-                                    base::Passed(&message)));
-
-      // Close the channel and wait for it to shutdown.
-      client_channel_->ShutDown();
-      client_channel_ = nullptr;
-
-      client_thread_->Stop();
-      client_thread_ = nullptr;
-    }
-
-    // Write a message to the channel, to verify whether this triggers an
-    // OnChannelError callback before all messages were read.
-    Channel::MessagePtr message = std::make_unique<Channel::Message>(1, 0);
-    channel_->Write(std::move(message));
-  }
-
-  void OnChannelError(Channel::Error error) override {
-    EXPECT_EQ(2, message_count_);
-    quit_closure_.Run();
-  }
-
-  base::RepeatingClosure quit_closure_;
-  int message_count_ = 0;
-  scoped_refptr<Channel> channel_;
-
-  scoped_refptr<Channel> client_channel_;
-  std::unique_ptr<base::Thread> client_thread_;
-};
-
-TEST(ChannelTest, PeerShutdownDuringRead) {
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
-  PlatformChannelPair channel_pair;
-
-  // Create a "client" Channel with one end of the pipe, and Start() it.
-  std::unique_ptr<base::Thread> client_thread =
-      std::make_unique<base::Thread>("clientio_thread");
-  client_thread->StartWithOptions(
-      base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
-
-  scoped_refptr<Channel> client_channel =
-      Channel::Create(nullptr,
-                      ConnectionParams(TransportProtocol::kLegacy,
-                                       channel_pair.PassClientHandle()),
-                      client_thread->task_runner());
-  client_channel->Start();
-
-  // On the "client" IO thread, create and write a message.
-  Channel::MessagePtr message = std::make_unique<Channel::Message>(1, 0);
-  client_thread->task_runner()->PostTask(
-      FROM_HERE,
-      base::BindOnce(&Channel::Write, client_channel, base::Passed(&message)));
-
-  // Create a "server" Channel with the other end of the pipe, and process the
-  // messages from it. The |server_delegate| will ShutDown the client end of
-  // the pipe after the first message, and quit the RunLoop when OnChannelError
-  // is received.
-  base::RunLoop run_loop;
-  ChannelTestShutdownAndWriteDelegate server_delegate(
-      channel_pair.PassServerHandle(), message_loop.task_runner(),
-      std::move(client_channel), std::move(client_thread),
-      run_loop.QuitClosure());
-
-  run_loop.Run();
-}
-
 }  // namespace
 }  // namespace edk
 }  // namespace mojo

mojo/edk/system/channel_win.cc

@@ -81,17 +81,19 @@ class ChannelWin : public Channel,
         handle_(std::move(handle)),
         io_task_runner_(io_task_runner) {
     CHECK(handle_.is_valid());
+
+    wait_for_connect_ = handle_.get().needs_connection;
   }
 
   void Start() override {
     io_task_runner_->PostTask(
-        FROM_HERE, base::BindOnce(&ChannelWin::StartOnIOThread, this));
+        FROM_HERE, base::Bind(&ChannelWin::StartOnIOThread, this));
   }
 
   void ShutDownImpl() override {
     // Always shut down asynchronously when called through the public interface.
     io_task_runner_->PostTask(
-        FROM_HERE, base::BindOnce(&ChannelWin::ShutDownOnIOThread, this));
+        FROM_HERE, base::Bind(&ChannelWin::ShutDownOnIOThread, this));
   }
 
   void Write(MessagePtr message) override {
@@ -107,11 +109,11 @@ class ChannelWin : public Channel,
         reject_writes_ = write_error = true;
     }
     if (write_error) {
-      // Do not synchronously invoke OnWriteError(). Write() may have been
-      // called by the delegate and we don't want to re-enter it.
-      io_task_runner_->PostTask(FROM_HERE,
-                                base::BindOnce(&ChannelWin::OnWriteError, this,
-                                               Error::kDisconnected));
+      // Do not synchronously invoke OnError(). Write() may have been called by
+      // the delegate and we don't want to re-enter it.
+      io_task_runner_->PostTask(
+          FROM_HERE,
+          base::Bind(&ChannelWin::OnError, this, Error::kDisconnected));
     }
   }
 
@@ -151,7 +153,7 @@ class ChannelWin : public Channel,
     base::MessageLoopForIO::current()->RegisterIOHandler(
         handle_.get().handle, this);
 
-    if (handle_.get().needs_connection) {
+    if (wait_for_connect_) {
       BOOL ok = ConnectNamedPipe(handle_.get().handle,
                                  &connect_context_.overlapped);
       if (ok) {
@@ -163,12 +165,12 @@ class ChannelWin : public Channel,
       const DWORD err = GetLastError();
       switch (err) {
         case ERROR_PIPE_CONNECTED:
+          wait_for_connect_ = false;
           break;
         case ERROR_IO_PENDING:
-          is_connect_pending_ = this;
+          AddRef();
           return;
         case ERROR_NO_DATA:
-        default:
           OnError(Error::kConnectionFailed);
           return;
       }
@@ -199,7 +201,7 @@ class ChannelWin : public Channel,
       ignore_result(handle_.release());
     handle_.reset();
 
-    // Allow |this| to be destroyed as soon as no IO is pending.
+    // May destroy the |this| if it was the last reference.
     self_ = nullptr;
   }
 
@@ -215,13 +217,10 @@ class ChannelWin : public Channel,
                      DWORD bytes_transfered,
                      DWORD error) override {
     if (error != ERROR_SUCCESS) {
-      if (context == &write_context_)
-        OnWriteError(Error::kDisconnected);
-      else
-        OnError(Error::kDisconnected);
+      OnError(Error::kDisconnected);
     } else if (context == &connect_context_) {
-      DCHECK(is_connect_pending_);
-      scoped_refptr<ChannelWin> self(std::move(is_connect_pending_));
+      DCHECK(wait_for_connect_);
+      wait_for_connect_ = false;
       ReadMore(0);
 
       base::AutoLock lock(write_lock_);
@@ -230,14 +229,12 @@ class ChannelWin : public Channel,
         WriteNextNoLock();
       }
     } else if (context == &read_context_) {
-      scoped_refptr<ChannelWin> self(std::move(is_read_pending_));
       OnReadDone(static_cast<size_t>(bytes_transfered));
     } else {
       CHECK(context == &write_context_);
-      scoped_refptr<ChannelWin> self(std::move(is_write_pending_));
       OnWriteDone(static_cast<size_t>(bytes_transfered));
     }
-    // |this| may have been deleted by the time we reach here.
+    Release();  // Balancing reference taken after ReadFile / WriteFile.
   }
 
   void OnReadDone(size_t bytes_read) {
@@ -279,7 +276,7 @@ class ChannelWin : public Channel,
         reject_writes_ = write_error = true;
     }
     if (write_error)
-      OnWriteError(Error::kDisconnected);
+      OnError(Error::kDisconnected);
   }
 
   void ReadMore(size_t next_read_size_hint) {
@@ -294,7 +291,7 @@ class ChannelWin : public Channel,
                        &read_context_.overlapped);
 
     if (ok || GetLastError() == ERROR_IO_PENDING) {
-      is_read_pending_ = this;
+      AddRef();  // Will be balanced in OnIOCompleted
     } else {
       OnError(Error::kDisconnected);
     }
@@ -311,7 +308,7 @@ class ChannelWin : public Channel,
                         &write_context_.overlapped);
 
     if (ok || GetLastError() == ERROR_IO_PENDING) {
-      is_write_pending_ = this;
+      AddRef();  // Will be balanced in OnIOCompleted.
       return true;
     }
     return false;
@@ -323,21 +320,6 @@ class ChannelWin : public Channel,
     return WriteNoLock(outgoing_messages_.front());
   }
 
-  void OnWriteError(Error error) {
-    DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
-    DCHECK(reject_writes_);
-
-    if (error == Error::kDisconnected) {
-      // If we can't write because the pipe is disconnected then continue
-      // reading to fetch any in-flight messages, relying on end-of-stream to
-      // signal the actual disconnection.
-      if (is_read_pending_ || is_connect_pending_)
-        return;
-    }
-
-    OnError(error);
-  }
-
   // Keeps the Channel alive at least until explicit shutdown on the IO thread.
   scoped_refptr<Channel> self_;
 
@@ -347,15 +329,16 @@ class ChannelWin : public Channel,
   base::MessageLoopForIO::IOContext connect_context_;
   base::MessageLoopForIO::IOContext read_context_;
   base::MessageLoopForIO::IOContext write_context_;
-  scoped_refptr<ChannelWin> is_connect_pending_;
-  scoped_refptr<ChannelWin> is_read_pending_;
-  scoped_refptr<ChannelWin> is_write_pending_;
 
-  // Protects |delay_writes_|, |reject_writes_| and |outgoing_messages_|.
+  // Protects |reject_writes_| and |outgoing_messages_|.
   base::Lock write_lock_;
-  base::circular_deque<MessageView> outgoing_messages_;
+
   bool delay_writes_ = true;
+
   bool reject_writes_ = false;
+  base::circular_deque<MessageView> outgoing_messages_;
+
+  bool wait_for_connect_;
 
   bool leak_handle_ = false;