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 32 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())
       return true;
+    if (pm->IsBackgroundHostClosing(extension->id()))
+      pm->CancelSuspend(extension);
   }
 
   return false;
 }
 
 void LazyBackgroundTaskQueue::AddPendingTask(
     Profile* profile,
     const std::string& extension_id,
     const PendingTask& task) {
   PendingTasksList* tasks_list = NULL;
@@ skipping 22 matching lines @@
     // When the background host finishes closing, we will reload it.
     pending_page_loads_.insert(PendingTasksKey(profile, extension_id));
     return;
   }
 
   const Extension* extension =
       ExtensionSystem::Get(profile)->extension_service()->
           extensions()->GetByID(extension_id);
   if (extension) {
     DCHECK(extension->has_lazy_background_page());
-    pm->IncrementLazyKeepaliveCount(
-        extension, ExtensionProcessManager::DONT_CANCEL_SUSPEND);
+    pm->IncrementLazyKeepaliveCount(extension);
     pm->CreateBackgroundHost(extension, extension->GetBackgroundURL());
   }
 
   pending_page_loads_.erase(PendingTasksKey(profile, extension_id));
 }
 
 void LazyBackgroundTaskQueue::ProcessPendingTasks(
     ExtensionHost* host,
     Profile* profile,
     const Extension* extension) {
@@ skipping 75 matching lines @@
       }
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace extensions