Fix a bug where chrome.runtime.getBackgroundPage would return null if the event

chrome/browser/extensions/api/runtime/runtime_api.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/api/runtime/runtime_api.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
@@ skipping 114 matching lines @@
     return;
 
   scoped_ptr<ListValue> args(new ListValue);
   args->Append(manifest->DeepCopy());
   DCHECK(system->event_router());
   scoped_ptr<Event> event(new Event(kOnUpdateAvailableEvent, args.Pass()));
   system->event_router()->DispatchEventToExtension(extension_id, event.Pass());
 }
 
 bool RuntimeGetBackgroundPageFunction::RunImpl() {
-  ExtensionHost* host =
-      ExtensionSystem::Get(profile())->process_manager()->
-          GetBackgroundHostForExtension(extension_id());
-  if (host) {
+  ExtensionSystem* system = ExtensionSystem::Get(profile());
+  ExtensionHost* host = system->process_manager()->
+      GetBackgroundHostForExtension(extension_id());
+  if (system->lazy_background_task_queue()->ShouldEnqueueTask(
+          profile(), GetExtension())) {
+    system->lazy_background_task_queue()->AddPendingTask(
+       profile(), extension_id(),
+       base::Bind(&RuntimeGetBackgroundPageFunction::OnPageLoaded, this));
+  } else if (host) {
     OnPageLoaded(host);
-  } else if (GetExtension()->has_lazy_background_page()) {
-    ExtensionSystem::Get(profile())->lazy_background_task_queue()->
-        AddPendingTask(
-           profile(), extension_id(),
-           base::Bind(&RuntimeGetBackgroundPageFunction::OnPageLoaded,
-                      this));
   } else {
     error_ = kNoBackgroundPageError;
     return false;
   }
 
   return true;
 }
 
 void RuntimeGetBackgroundPageFunction::OnPageLoaded(ExtensionHost* host) {
   if (host) {
@@ skipping 81 matching lines @@
   did_reply_ = true;
   results_.reset(new base::ListValue);
   results_->AppendString(kUpdateFound);
   base::DictionaryValue* details = new base::DictionaryValue;
   results_->Append(details);
   details->SetString("version", version);
   SendResponse(true);
 }
 
 }   // namespace extensions