Unrevert 152017 - Add chrome.runtime.onStartup, which is fired on browser start.

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 "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 24 matching lines @@
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(profile));
 }
 
 LazyBackgroundTaskQueue::~LazyBackgroundTaskQueue() {
 }
 
 bool LazyBackgroundTaskQueue::ShouldEnqueueTask(
     Profile* profile, const Extension* extension) {
   DCHECK(extension);
-  if (extension->has_lazy_background_page()) {
+  if (extension->has_background_page()) {
     ExtensionProcessManager* pm = profile->GetExtensionProcessManager();
     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;
   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, ensure the background page
-    // is loaded.
     const Extension* extension =
         ExtensionSystem::Get(profile)->extension_service()->
             extensions()->GetByID(extension_id);
-    DCHECK(extension->has_lazy_background_page());
-    ExtensionProcessManager* pm =
-        ExtensionSystem::Get(profile)->process_manager();
-    pm->IncrementLazyKeepaliveCount(extension);
-    pm->CreateBackgroundHost(extension, extension->GetBackgroundURL());
+    if (extension && extension->has_lazy_background_page()) {
+      // If this is the first enqueued task, and we're not waiting for the
+      // background page to unload, ensure the background page is loaded.
+      ExtensionProcessManager* pm =
+          ExtensionSystem::Get(profile)->process_manager();
+      pm->IncrementLazyKeepaliveCount(extension);
+      pm->CreateBackgroundHost(extension, extension->GetBackgroundURL());
+    }
   } else {
     tasks_list = it->second.get();
   }
 
   tasks_list->push_back(task);
 }
 
 void LazyBackgroundTaskQueue::ProcessPendingTasks(
     ExtensionHost* host,
     Profile* profile,
     const Extension* extension) {
-  if (!profile->IsSameProfile(profile_) ||
-      !extension->has_lazy_background_page())
+  if (!profile->IsSameProfile(profile_))
     return;
 
   PendingTasksKey key(profile, extension->id());
   PendingTasksMap::iterator map_it = pending_tasks_.find(key);
   if (map_it == pending_tasks_.end()) {
-    CHECK(!host);  // lazy page should not load without any pending tasks
+    if (extension->has_lazy_background_page())
+      CHECK(!host);  // lazy page should not load without any pending tasks
     return;
   }
 
   // Swap the pending tasks to a temporary, to avoid problems if the task
   // list is modified during processing.
   PendingTasksList tasks;
   tasks.swap(*map_it->second);
   for (PendingTasksList::const_iterator it = tasks.begin();
        it != tasks.end(); ++it) {
     it->Run(host);
   }
 
   pending_tasks_.erase(key);
 
   // Balance the keepalive in AddPendingTask. Note we don't do this on a
   // failure to load, because the keepalive count is reset in that case.
-  if (host) {
+  if (host && extension->has_lazy_background_page()) {
     ExtensionSystem::Get(profile)->process_manager()->
         DecrementLazyKeepaliveCount(extension);
   }
 }
 
 void LazyBackgroundTaskQueue::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
@@ skipping 35 matching lines @@
       }
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace extensions