When an extension is unloaded, unregister all event listeners, not just the lazy ones.

extensions/browser/event_listener_map_unittest.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 "extensions/browser/event_listener_map.h"
 
 #include "base/bind.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "extensions/browser/event_router.h"
@@ skipping 223 matching lines @@
   std::set<const EventListener*> targets(listeners_->GetEventListeners(*event));
   ASSERT_EQ(0u, targets.size());
 }
 
 TEST_F(EventListenerMapTest, HostSuffixFilterEquality) {
   scoped_ptr<DictionaryValue> filter1(CreateHostSuffixFilter("google.com"));
   scoped_ptr<DictionaryValue> filter2(CreateHostSuffixFilter("google.com"));
   ASSERT_TRUE(filter1->Equals(filter2.get()));
 }
 
-TEST_F(EventListenerMapTest, RemoveLazyListeners) {
+TEST_F(EventListenerMapTest, RemoveListenersForExtension) {
   listeners_->AddListener(EventListener::ForExtension(
       kEvent1Name, kExt1Id, NULL, CreateHostSuffixFilter("google.com")));
   listeners_->AddListener(EventListener::ForExtension(
       kEvent2Name, kExt1Id, NULL, CreateHostSuffixFilter("google.com")));
 
-  listeners_->RemoveLazyListenersForExtension(kExt1Id);
+  listeners_->RemoveListenersForExtension(kExt1Id);
 
   scoped_ptr<Event> event(CreateNamedEvent(kEvent1Name));
   event->filter_info.SetURL(GURL("http://www.google.com"));
   std::set<const EventListener*> targets(listeners_->GetEventListeners(*event));
   ASSERT_EQ(0u, targets.size());
 
   event->event_name = kEvent2Name;
   targets = listeners_->GetEventListeners(*event);
   ASSERT_EQ(0u, targets.size());
 }
@@ skipping 75 matching lines @@
       kEvent1Name, kExt1Id, process_.get(), scoped_ptr<DictionaryValue>()));
   // Lazy listener.
   listeners_->AddListener(EventListener::ForExtension(
       kEvent1Name, kExt1Id, NULL, scoped_ptr<DictionaryValue>()));
 
   ASSERT_FALSE(listeners_->HasListenerForExtension(kExt1Id, kEvent2Name));
   ASSERT_TRUE(listeners_->HasListenerForExtension(kExt1Id, kEvent1Name));
   ASSERT_FALSE(listeners_->HasListenerForExtension(kExt2Id, kEvent1Name));
   listeners_->RemoveListenersForProcess(process_.get());
   ASSERT_TRUE(listeners_->HasListenerForExtension(kExt1Id, kEvent1Name));
-  listeners_->RemoveLazyListenersForExtension(kExt1Id);
+  listeners_->RemoveListenersForExtension(kExt1Id);
   ASSERT_FALSE(listeners_->HasListenerForExtension(kExt1Id, kEvent1Name));
 }
 
 TEST_F(EventListenerMapTest, AddLazyListenersFromPreferences) {
   scoped_ptr<DictionaryValue> filter1(CreateHostSuffixFilter("google.com"));
   scoped_ptr<DictionaryValue> filter2(CreateHostSuffixFilter("yahoo.com"));
 
   DictionaryValue filtered_listeners;
   ListValue* filter_list = new ListValue();
   filtered_listeners.Set(kEvent1Name, filter_list);
@@ skipping 23 matching lines @@
 
   scoped_ptr<Event> event(CreateEvent(kEvent1Name,
                           GURL("http://www.google.com")));
   std::set<const EventListener*> targets(listeners_->GetEventListeners(*event));
   ASSERT_EQ(0u, targets.size());
 }
 
 }  // namespace
 
 }  // namespace extensions