Fixing 27834 by always deleting ExtensionMessageService on...

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/json_writer.h"
 #include "base/singleton.h"
 #include "base/stl_util-inl.h"
 #include "base/values.h"
@@ skipping 97 matching lines @@
     "Port.dispatchOnDisconnect";
 const char ExtensionMessageService::kDispatchOnMessage[] =
     "Port.dispatchOnMessage";
 const char ExtensionMessageService::kDispatchEvent[] =
     "Event.dispatchJSON";
 
 ExtensionMessageService::ExtensionMessageService(Profile* profile)
     : profile_(profile),
       extension_devtools_manager_(NULL),
       next_port_id_(0) {
+  if (!ChromeThread::GetCurrentThreadIdentifier(&thread_id_)) {
+    // If we get created in unit test, GetCurrentThreadIdentifier fails.
+    // Assign thread_id_ to an ID not used.
+    thread_id_ = ChromeThread::ID_COUNT;
+  }
   registrar_.Add(this, NotificationType::RENDERER_PROCESS_TERMINATED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::RENDERER_PROCESS_CLOSED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::RENDER_VIEW_HOST_DELETED,
                  NotificationService::AllSources());
 
   extension_devtools_manager_ = profile_->GetExtensionDevToolsManager();
 }
 
 ExtensionMessageService::~ExtensionMessageService() {
   STLDeleteContainerPairSecondPointers(channels_.begin(), channels_.end());
   channels_.clear();
 }
 
 void ExtensionMessageService::ProfileDestroyed() {
   profile_ = NULL;
-
-  // We remove notifications here because our destructor might be called on
-  // a non-UI thread.
-  registrar_.RemoveAll();
+  if (!registrar_.IsEmpty()) {
+    if (thread_id_ != ChromeThread::ID_COUNT)
+      CHECK(ChromeThread::CurrentlyOn(thread_id_));

[Erik does not do reviews, 2009/11/25 15:52:11]

If GetCurrentThreadIdentifier fails, I don't see how CurrentlyOn could work

[huanr, 2009/11/25 17:16:38]

If GetCurrentThreadIdentifier fails, the thread_id_ will be ID_COUNT.

On 2009/11/25 15:52:11, Erik Kay wrote:

[Erik does not do reviews, 2009/11/25 17:32:49]

I think you're missing my point.  CurrentlyOn uses the same mechanism as
GetCurrentThreadIdentifier.  If one of them doesn't work, neither will the other
one.

In fact, it's worse than this.  Looking at the code, both methods DCHECK if
identifier is >= ID_COUNT, so you're going to hit DCHECKs anyway.

+    registrar_.RemoveAll();
+  }
 }
 
 void ExtensionMessageService::AddEventListener(const std::string& event_name,
                                                int render_process_id) {
   DCHECK(RenderProcessHost::FromID(render_process_id)) <<
       "Adding event listener to a non-existant RenderProcessHost.";
   DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI);
   DCHECK_EQ(listeners_[event_name].count(render_process_id), 0u) << event_name;
   listeners_[event_name].insert(render_process_id);
 
@@ skipping 373 matching lines @@
 
     if (current->second->opener.sender == sender) {
       CloseChannelImpl(current, GET_CHANNEL_OPENER_ID(current->first),
                        notify_other_port);
     } else if (current->second->receiver.sender == sender) {
       CloseChannelImpl(current, GET_CHANNEL_RECEIVERS_ID(current->first),
                        notify_other_port);
     }
   }
 }