Don't close background pages if there is a pending response (callback).

chrome/renderer/extensions/extension_process_bindings.cc

 // Copyright (c) 2011 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/renderer/extensions/extension_process_bindings.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 48 matching lines @@
 const char* kExtensionDeps[] = {
   "extensions/event.js",
   "extensions/json_schema.js",
   "extensions/renderer_extension_bindings.js",
   "extensions/apitest.js"
 };
 
 // Contains info relevant to a pending API request.
 struct PendingRequest {
  public :
-  PendingRequest(v8::Persistent<v8::Context> context, const std::string& name)
-      : context(context), name(name) {
+  PendingRequest(v8::Persistent<v8::Context> context, const std::string& name,
+                 const std::string& extension_id)
+      : context(context), name(name), extension_id(extension_id) {
   }
   v8::Persistent<v8::Context> context;
   std::string name;
+  std::string extension_id;
 };
 typedef std::map<int, linked_ptr<PendingRequest> > PendingRequestMap;
 
 base::LazyInstance<PendingRequestMap> g_pending_requests(
     base::LINKER_INITIALIZED);
 
 // A RenderViewVisitor class that iterates through the set of available
 // views, looking for a view of the given type, in the given browser window
 // and within the given extension.
 // Used to accumulate the list of views associated with an extension.
@@ skipping 382 matching lines @@
       source_url = webframe->document().url();
 
     int request_id = args[2]->Int32Value();
     bool has_callback = args[3]->BooleanValue();
     bool for_io_thread = args[4]->BooleanValue();
 
     v8::Persistent<v8::Context> v8_context =
         v8::Persistent<v8::Context>::New(v8::Context::GetCurrent());
     DCHECK(!v8_context.IsEmpty());
     g_pending_requests.Get()[request_id].reset(new PendingRequest(
-        v8_context, name));
+        v8_context, name, current_context->extension_id()));
 
     ExtensionHostMsg_Request_Params params;
     params.name = name;
     params.arguments.Swap(value_args);
     params.source_url = source_url;
     params.request_id = request_id;
     params.has_callback = has_callback;
     params.user_gesture =
         webframe ? webframe->isProcessingUserGesture() : false;
     if (for_io_thread) {
@@ skipping 111 matching lines @@
            static_cast<ExtensionImpl*>(extension)->extension_dispatcher());
   return extension;
 }
 
 // static
 void ExtensionProcessBindings::HandleResponse(
     const ChromeV8ContextSet& contexts,
     int request_id,
     bool success,
     const std::string& response,
-    const std::string& error) {
+    const std::string& error,
+    std::string* extension_id) {
   PendingRequestMap::iterator request =
       g_pending_requests.Get().find(request_id);
   if (request == g_pending_requests.Get().end()) {
     // This should not be able to happen since we only remove requests when they
     // are handled.
     LOG(ERROR) << "Could not find specified request id: " << request_id;
     return;
   }
 
   ChromeV8Context* v8_context =
@@ skipping 16 matching lines @@
                                            &retval));
   // In debug, the js will validate the callback parameters and return a
   // string if a validation error has occured.
 #ifndef NDEBUG
   if (!retval.IsEmpty() && !retval->IsUndefined()) {
     std::string error = *v8::String::AsciiValue(retval);
     DCHECK(false) << error;
   }
 #endif
 
+  // Save the extension id before erasing the request.
+  *extension_id = request->second->extension_id;
+
   request->second->context.Dispose();
   request->second->context.Clear();
   g_pending_requests.Get().erase(request);
 }
+
+// static
+bool ExtensionProcessBindings::HasPendingRequests(
+    const std::string& extension_id) {
+  for (PendingRequestMap::const_iterator it = g_pending_requests.Get().begin();
+       it != g_pending_requests.Get().end(); ++it) {
+    if (it->second->extension_id == extension_id)
+      return true;
+  }
+  return false;
+}