Fix shutdown assert with the new Mojo EDK.

mojo/edk/system/routed_raw_channel.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/system/routed_raw_channel.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "mojo/edk/embedder/embedder_internal.h"
 
@@ skipping 114 matching lines @@
     memcpy(&msg->message[0], message_view.main_buffer(),
            message_view.total_size());
     msg->handles = platform_handles.Pass();
     pending_messages_.push_back(msg.Pass());
   }
 }
 
 void RoutedRawChannel::OnError(Error error) {
   DCHECK(internal::g_io_thread_task_runner->RunsTasksOnCurrentThread());
 
-  channel_->Shutdown();
-  channel_ = nullptr;
+  // This needs to match non-multiplexed MessagePipeDispatcher's destruction of
+  // the channel only when read errors occur.
+  if (error != ERROR_WRITE) {
+    channel_->Shutdown();
+    channel_ = nullptr;
+  }
+
   if (routes_.empty()) {
     delete this;
     return;
   }
 
   for (auto it = routes_.begin(); it != routes_.end();) {
     // Handle the delegate calling RemoveRoute in this call.
     auto cur_it = it++;
     cur_it->second->OnError(error);
   }
 }
 
 }  // namespace edk
 }  // namespace mojo