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

mojo/edk/system/node_channel.h

 // 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.
 
 #ifndef MOJO_EDK_SYSTEM_NODE_CHANNEL_H_
 #define MOJO_EDK_SYSTEM_NODE_CHANNEL_H_
 
 #include <queue>
 #include <unordered_map>
 #include <utility>
@@ skipping 59 matching lines @@
 #if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS))
     virtual void OnRelayPortsMessage(const ports::NodeName& from_node,
                                      base::ProcessHandle from_process,
                                      const ports::NodeName& destination,
                                      Channel::MessagePtr message) = 0;
     virtual void OnPortsMessageFromRelay(const ports::NodeName& from_node,
                                          const ports::NodeName& source_node,
                                          Channel::MessagePtr message) = 0;
 #endif
 
-    virtual void OnChannelError(const ports::NodeName& node) = 0;
+    virtual void OnChannelError(const ports::NodeName& node,
+                                NodeChannel* channel) = 0;
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
     virtual MachPortRelay* GetMachPortRelay() = 0;
 #endif
   };
 
   static scoped_refptr<NodeChannel> Create(
       Delegate* delegate,
       ScopedPlatformHandle platform_handle,
       scoped_refptr<base::TaskRunner> io_task_runner,
@@ skipping 111 matching lines @@
   PendingRelayMessageQueue pending_relay_messages_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(NodeChannel);
 };
 
 }  // namespace edk
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_NODE_CHANNEL_H_