Introduce runtime.onSuspendCanceled() event.

chrome/browser/extensions/extension_event_router.cc

Index: chrome/browser/extensions/extension_event_router.cc
diff --git a/chrome/browser/extensions/extension_event_router.cc b/chrome/browser/extensions/extension_event_router.cc
index 89df410adebcb0fe29bad3c8df95d869da556085..a6bc04244314bf4400d490f13f881bc068cb9754 100644
--- a/chrome/browser/extensions/extension_event_router.cc
+++ b/chrome/browser/extensions/extension_event_router.cc
@@ -219,10 +219,6 @@ void ExtensionEventRouter::AddFilteredEventListener(
     const std::string& extension_id,
     const base::DictionaryValue& filter,
     bool add_lazy_listener) {
-  listeners_.AddListener(scoped_ptr<EventListener>(new EventListener(
-      event_name, extension_id, process,
-      scoped_ptr<DictionaryValue>(filter.DeepCopy()))));
-
   if (add_lazy_listener) {
     bool added = listeners_.AddListener(scoped_ptr<EventListener>(
         new EventListener(event_name, extension_id, NULL,
@@ -233,6 +229,10 @@ void ExtensionEventRouter::AddFilteredEventListener(
           profile_->GetExtensionService()->extension_prefs();
       prefs->AddFilterToEvent(event_name, extension_id, &filter);
     }
+  } else {

[Matt Perry, 2012/07/24 19:25:15]

Did you mean to make this change? It seems unrelated.

+    listeners_.AddListener(scoped_ptr<EventListener>(new EventListener(
+        event_name, extension_id, process,
+        scoped_ptr<DictionaryValue>(filter.DeepCopy()))));
   }
 }
 
@@ -476,12 +476,10 @@ void ExtensionEventRouter::MaybeLoadLazyBackgroundPageToDispatchEvent(
 
   extensions::LazyBackgroundTaskQueue* queue =
       extensions::ExtensionSystem::Get(profile)->lazy_background_task_queue();
-  if (queue->ShouldEnqueueTask(profile, extension)) {

[Matt Perry, 2012/07/24 19:25:15]

Doesn't removing this result in a double dispatch of the event? It means we'd
always call DispatchPendingEvent, even if we *shouldn't* enqueue the task - i.e.
if the event page is already loaded. Since a regular listener has been
registered in that case, we'll dispatch to the regular listener, then dispatch
again for this lazy listener.

[koz (OOO until 15th September), 2012/07/25 07:48:31]

The idea here was to make it so lazy background pages don't register non-lazy
event handlers, so the lazy dispatch will always either send to a currently
existing ExtensionHost or add a pending task.

-    queue->AddPendingTask(
-        profile, extension->id(),
-        base::Bind(&ExtensionEventRouter::DispatchPendingEvent,
-                   base::Unretained(this), event));
-  }
+  queue->AddPendingTask(
+      profile, extension->id(),
+      base::Bind(&ExtensionEventRouter::DispatchPendingEvent,
+                  base::Unretained(this), event));
 }
 
 void ExtensionEventRouter::IncrementInFlightEvents(