Close NaCl IPC channel when the NaClDesc is released

components/nacl/loader/nacl_ipc_adapter.cc

 // Copyright 2013 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 "components/nacl/loader/nacl_ipc_adapter.h"
 
 #include <limits.h>
 #include <string.h>
 
 #include <memory>
@@ skipping 49 matching lines @@
   return MESSAGE_IS_TRUNCATED;
 }
 
 //------------------------------------------------------------------------------
 // This object allows the NaClDesc to hold a reference to a NaClIPCAdapter and
 // forward calls to it.
 struct DescThunker {
   explicit DescThunker(NaClIPCAdapter* adapter_arg)
       : adapter(adapter_arg) {
   }
+
+  ~DescThunker() { adapter->CloseChannel(); }
+
   scoped_refptr<NaClIPCAdapter> adapter;
+
+  DISALLOW_COPY_AND_ASSIGN(DescThunker);
 };
 
 NaClIPCAdapter* ToAdapter(void* handle) {
   return static_cast<DescThunker*>(handle)->adapter.get();
 }
 
 // NaClDescCustom implementation.
 void NaClDescCustomDestroy(void* handle) {
   delete static_cast<DescThunker*>(handle);
 }
@@ skipping 757 matching lines @@
   header.flags = msg.flags();
   header.num_fds = static_cast<uint16_t>(rewritten_msg->desc_count());
 
   rewritten_msg->SetData(header, msg.payload(), msg.payload_size());
   locked_data_.to_be_received_.push(std::move(rewritten_msg));
 }
 
 int TranslatePepperFileReadWriteOpenFlagsForTesting(int32_t pp_open_flags) {
   return TranslatePepperFileReadWriteOpenFlags(pp_open_flags);
 }