ipc: Make sure that ChannelReader is destroyed correctly.

ipc/ipc_channel_reader.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_reader.h"
 
 #include <algorithm>
 
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_attachment_set.h"
 #include "ipc/ipc_message_macros.h"
 
 namespace IPC {
 namespace internal {
 
 ChannelReader::ChannelReader(Listener* listener) : listener_(listener) {
   memset(input_buf_, 0, sizeof(input_buf_));
 }
 
 ChannelReader::~ChannelReader() {
-  if (!blocked_ids_.empty())
-    StopObservingAttachmentBroker();
+  DCHECK(blocked_ids_.empty());
 }
 
 ChannelReader::DispatchState ChannelReader::ProcessIncomingMessages() {
   while (true) {
     int bytes_read = 0;
     ReadState read_state = ReadData(input_buf_, Channel::kReadBufferSize,
                                     &bytes_read);
     if (read_state == READ_FAILED)
       return DISPATCH_ERROR;
     if (read_state == READ_PENDING)
@@ skipping 20 matching lines @@
   return m.routing_id() == MSG_ROUTING_NONE &&
       m.type() >= Channel::CLOSE_FD_MESSAGE_TYPE &&
       m.type() <= Channel::HELLO_MESSAGE_TYPE;
 }
 
 bool ChannelReader::IsHelloMessage(const Message& m) {
   return m.routing_id() == MSG_ROUTING_NONE &&
       m.type() == Channel::HELLO_MESSAGE_TYPE;
 }
 
+void ChannelReader::CleanUp() {
+  if (!blocked_ids_.empty()) {
+    StopObservingAttachmentBroker();
+    blocked_ids_.clear();
+  }
+}
+
 bool ChannelReader::TranslateInputData(const char* input_data,
                                        int input_data_len) {
   const char* p;
   const char* end;
 
   // Possibly combine with the overflow buffer to make a larger buffer.
   if (input_overflow_buf_.empty()) {
     p = input_data;
     end = input_data + input_data_len;
   } else {
@@ skipping 158 matching lines @@
 }
 
 void ChannelReader::StopObservingAttachmentBroker() {
 #if USE_ATTACHMENT_BROKER
   GetAttachmentBroker()->RemoveObserver(this);
 #endif  // USE_ATTACHMENT_BROKER
 }
 
 }  // namespace internal
 }  // namespace IPC