Send port disconnect events when a frame is unloaded.

chrome/browser/extensions/extension_message_service.cc

 // Copyright (c) 2009 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 "chrome/browser/extensions/extension_message_service.h"
 
 #include "base/json_writer.h"
 #include "base/singleton.h"
 #include "base/stl_util-inl.h"
 #include "base/values.h"
@@ skipping 272 matching lines @@
   //      describe the originating tab to the target extension.
   //      This isn't really appropriate here, the originating tab
   //      information should be supplied by the caller for
   //      automation-initiated ports.
   OpenChannelOnUIThreadImpl(routing_id, port1_id, source, port2_id,
                             process_id, source_process_id);
 
   return port2_id;
 }
 
-void ExtensionMessageService::CloseAutomationChannel(int port_id) {
+void ExtensionMessageService::CloseChannel(int port_id) {
   DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI);
 
-  // TODO(siggi): Cleanup from the tab seems to beat this to the punch.
-  // DCHECK(channels_[GET_CHANNEL_ID(port_id)].port1 != NULL);
-  // TODO(siggi): should we notify the other side of the port?
-  channels_.erase(GET_CHANNEL_ID(port_id));
+  // Note: The channel might be gone already, if the other side closed first.
+  MessageChannelMap::iterator it = channels_.find(GET_CHANNEL_ID(port_id));
+  if (it != channels_.end())
+    CloseChannelImpl(it, port_id);
+}
+
+void ExtensionMessageService::CloseChannelImpl(
+    MessageChannelMap::iterator channel_iter, int port_id) {
+  DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI);
+
+  // Notify the other side.
+  if (port_id == GET_CHANNEL_PORT1(channel_iter->first)) {
+    DispatchOnDisconnect(channel_iter->second.port2, port_id);
+  } else {
+    DCHECK_EQ(port_id, GET_CHANNEL_PORT2(channel_iter->first));
+    DispatchOnDisconnect(channel_iter->second.port1, port_id);
+  }
+
+  channels_.erase(channel_iter);
 }
 
 void ExtensionMessageService::PostMessageFromRenderer(
     int port_id, const std::string& message) {
   DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI);
 
   MessageChannelMap::iterator iter =
       channels_.find(GET_CHANNEL_ID(port_id));
   if (iter == channels_.end())
     return;
@@ skipping 48 matching lines @@
       }
     }
   }
 
   // Close any channels that share this renderer.  We notify the opposite
   // port that his pair has closed.
   for (MessageChannelMap::iterator it = channels_.begin();
        it != channels_.end(); ) {
     MessageChannelMap::iterator current = it++;
     if (current->second.port1 == renderer) {
-      DispatchOnDisconnect(current->second.port2,
-                           GET_CHANNEL_PORT1(current->first));
-      channels_.erase(current);
+      CloseChannelImpl(current, GET_CHANNEL_PORT1(current->first));
     } else if (current->second.port2 == renderer) {
-      DispatchOnDisconnect(current->second.port1,
-                           GET_CHANNEL_PORT2(current->first));
-      channels_.erase(current);
+      CloseChannelImpl(current, GET_CHANNEL_PORT2(current->first));
     }
   }
 }