Followup fix to r365175 for new Mojo EDK.

We need to ensure the channel is shutdown before RoutedRawChannel destructs.

BUG=561803

Review URL: https://codereview.chromium.org/1526093002

Cr-Commit-Position: refs/heads/master@{#365286}

1 files changed, 2 insertions, 1 deletions

diff --git a/mojo/edk/system/routed_raw_channel.cc b/mojo/edk/system/routed_raw_channel.cc
index b985f56..cd57693 100644
--- a/mojo/edk/system/routed_raw_channel.cc
+++ b/mojo/edk/system/routed_raw_channel.cc
@@ -85,6 +85,7 @@ void RoutedRawChannel::RemoveRoute(uint64_t route_id) {
 }
 
 RoutedRawChannel::~RoutedRawChannel() {
+  DCHECK(!channel_);
   destruct_callback_.Run(this);
 }
 
@@ -134,7 +135,7 @@ void RoutedRawChannel::OnError(Error error) {
 
   // This needs to match non-multiplexed MessagePipeDispatcher's destruction of
   // the channel only when read errors occur.
-  if (error != ERROR_WRITE) {
+  if (error != ERROR_WRITE || routes_.empty()) {
     channel_->Shutdown();
     channel_ = nullptr;
   }