ipc: Make sure that ChannelReader is destroyed correctly.

ipc/ipc_channel_nacl.cc

 // Copyright (c) 2012 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 "ipc/ipc_channel_nacl.h"
 
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
@@ skipping 123 matching lines @@
       broker_(broker) {
   if (!CreatePipe(channel_handle)) {
     // The pipe may have been closed already.
     const char *modestr = (mode_ & MODE_SERVER_FLAG) ? "server" : "client";
     LOG(WARNING) << "Unable to create pipe named \"" << channel_handle.name
                  << "\" in " << modestr << " mode";
   }
 }
 
 ChannelNacl::~ChannelNacl() {
+  CleanUp();
   Close();
 }
 
 base::ProcessId ChannelNacl::GetPeerPID() const {
   // This shouldn't actually get used in the untrusted side of the proxy, and we
   // don't have the real pid anyway.
   return -1;
 }
 
 base::ProcessId ChannelNacl::GetSelfPID() const {
@@ skipping 244 matching lines @@
 // static
 scoped_ptr<Channel> Channel::Create(const IPC::ChannelHandle& channel_handle,
                                     Mode mode,
                                     Listener* listener,
                                     AttachmentBroker* broker) {
   return scoped_ptr<Channel>(
       new ChannelNacl(channel_handle, mode, listener, broker));
 }
 
 }  // namespace IPC