Introduce runtime.onSuspendCanceled() event.

chrome/browser/extensions/lazy_background_task_queue.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 "chrome/browser/extensions/lazy_background_task_queue.h"
 
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
@@ skipping 30 matching lines @@
 }
 
 bool LazyBackgroundTaskQueue::ShouldEnqueueTask(
     Profile* profile, const Extension* extension) {
   DCHECK(extension);
   if (extension->has_lazy_background_page()) {
     ExtensionProcessManager* pm =
          ExtensionSystem::Get(profile)->process_manager();
     ExtensionHost* background_host =
         pm->GetBackgroundHostForExtension(extension->id());
-    if (!background_host || !background_host->did_stop_loading() ||
-        pm->IsBackgroundHostClosing(extension->id()))
+    if (!background_host || !background_host->did_stop_loading())
       return true;
   }
 
   return false;
 }
 
+const Extension* GetExtension(Profile* profile,
+                              const std::string& extension_id) {
+  return ExtensionSystem::Get(profile)->extension_service()->
+          extensions()->GetByID(extension_id);
+}
+
+bool LazyBackgroundTaskQueue::ExecuteTaskNowIfPossible(
+    Profile* profile,
+    const std::string& extension_id,
+    const PendingTask& task) {
+  const Extension* extension = GetExtension(profile, extension_id);
+  if (ShouldEnqueueTask(profile, extension))
+    return false;
+
+  ExtensionProcessManager* pm =
+        ExtensionSystem::Get(profile)->process_manager();
+  ExtensionHost* host = pm->GetBackgroundHostForExtension(extension_id);
+
+  if (!host)
+    return true;

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

I think you still want to run the task with a NULL host here. Some of the call
sites (the settings handler) want to still call their task even if there is no
background page.

+
+  if (pm->IsBackgroundHostClosing(extension_id))
+    pm->CancelSuspend(extension_id);
+
+  task.Run(host);
+  return true;
+}
+
 void LazyBackgroundTaskQueue::AddPendingTask(
     Profile* profile,
     const std::string& extension_id,
     const PendingTask& task) {
+  if (ExecuteTaskNowIfPossible(profile, extension_id, task))
+    return;
   PendingTasksList* tasks_list = NULL;
   PendingTasksKey key(profile, extension_id);
   PendingTasksMap::iterator it = pending_tasks_.find(key);
   if (it == pending_tasks_.end()) {
     tasks_list = new PendingTasksList();
     pending_tasks_[key] = linked_ptr<PendingTasksList>(tasks_list);
 
     // If this is the first enqueued task, and we're not waiting for the
     // background page to unload, ensure the background page is loaded.
     if (pending_page_loads_.count(key) == 0)
@@ skipping 109 matching lines @@
       }
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace extensions