[mojo-edk] Close pending merges if the parent channel dies.

mojo/edk/system/node_channel.cc

 // Copyright 2016 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/node_channel.h"
 
 #include <cstring>
 #include <limits>
 #include <sstream>
 
@@ skipping 485 matching lines @@
     if (handles && !relay) {
       if (!MachPortRelay::ReceivePorts(handles.get())) {
         LOG(ERROR) << "Error receiving mach ports.";
       }
     }
   }
 #endif  // defined(OS_WIN)
 
 
   if (payload_size <= sizeof(Header)) {
-    delegate_->OnChannelError(remote_node_name_);
+    delegate_->OnChannelError(remote_node_name_, this);
     return;
   }
 
   const Header* header = static_cast<const Header*>(payload);
   switch (header->type) {
     case MessageType::ACCEPT_CHILD: {
       const AcceptChildData* data;
       if (GetMessagePayload(payload, payload_size, &data)) {
         delegate_->OnAcceptChild(remote_node_name_, data->parent_name,
                                  data->token);
@@ skipping 209 matching lines @@
       }
       break;
 
 #endif  // defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS))
 
     default:
       break;
   }
 
   DLOG(ERROR) << "Received invalid message. Closing channel.";
-  delegate_->OnChannelError(remote_node_name_);
+  delegate_->OnChannelError(remote_node_name_, this);
 }
 
 void NodeChannel::OnChannelError() {
   DCHECK(io_task_runner_->RunsTasksOnCurrentThread());
 
   RequestContext request_context(RequestContext::Source::SYSTEM);
 
   ShutDown();
   // |OnChannelError()| may cause |this| to be destroyed, but still need access
   // to the name name after that destruction. So may a copy of
   // |remote_node_name_| so it can be used if |this| becomes destroyed.
   ports::NodeName node_name = remote_node_name_;
-  delegate_->OnChannelError(node_name);
+  delegate_->OnChannelError(node_name, this);
 }
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 void NodeChannel::OnProcessReady(base::ProcessHandle process) {
   io_task_runner_->PostTask(FROM_HERE, base::Bind(
       &NodeChannel::ProcessPendingMessagesWithMachPorts, this));
 }
 
 void NodeChannel::ProcessPendingMessagesWithMachPorts() {
   MachPortRelay* relay = delegate_->GetMachPortRelay();
@@ skipping 107 matching lines @@
 
   base::AutoLock lock(channel_lock_);
   if (!channel_)
     DLOG(ERROR) << "Dropping message on closed channel.";
   else
     channel_->Write(std::move(message));
 }
 
 }  // namespace edk
 }  // namespace mojo