Attempting to fix problems in 11571014.

chrome/renderer/extensions/request_sender.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/renderer/extensions/request_sender.h"
 
 #include "base/values.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/renderer/extensions/chrome_v8_context.h"
 #include "chrome/renderer/extensions/dispatcher.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/v8_value_converter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 
 using content::V8ValueConverter;
 
 namespace extensions {
 
 // Contains info relevant to a pending API request.
 struct PendingRequest {
  public :
-  PendingRequest(ChromeV8Context* context,
-                 ChromeV8Context* caller_context,
-                 const std::string& name)
-      : name(name), context(context), caller_context(caller_context) {
+  PendingRequest(const std::string& name, ChromeV8Context* context)
+      : name(name), context(context) {
   }
 
   std::string name;
   ChromeV8Context* context;
-  ChromeV8Context* caller_context;
 };
 
 RequestSender::RequestSender(Dispatcher* dispatcher) : dispatcher_(dispatcher) {
 }
 
 RequestSender::~RequestSender() {
 }
 
 void RequestSender::InsertRequest(int request_id,
                                   PendingRequest* pending_request) {
@@ skipping 34 matching lines @@
     return;
 
   GURL source_url;
   WebKit::WebSecurityOrigin source_origin;
   WebKit::WebFrame* webframe = context->web_frame();
   if (webframe) {
     source_url = webframe->document().url();
     source_origin = webframe->document().securityOrigin();
   }
 
-  std::string extension_id = context->GetExtensionID();
-  // Insert the current context into the PendingRequest because that's the
-  // context that we call back on.
-  InsertRequest(
-      request_id,
-      new PendingRequest(context,
-                         dispatcher_->v8_context_set().GetCurrent(),
-                         name));
+  InsertRequest(request_id, new PendingRequest(name, context));
 
   ExtensionHostMsg_Request_Params params;
   params.name = name;
   params.arguments.Swap(value_args);
-  params.extension_id = extension_id;
+  params.extension_id = context->GetExtensionID();
   params.source_url = source_url;
   params.source_origin = source_origin.toString();
   params.request_id = request_id;
   params.has_callback = has_callback;
   params.user_gesture =
       webframe ? webframe->isProcessingUserGesture() : false;
   if (for_io_thread) {
     renderview->Send(new ExtensionHostMsg_RequestForIOThread(
         renderview->GetRoutingID(), params));
   } else {
@@ skipping 19 matching lines @@
   v8::Handle<v8::Value> argv[] = {
     v8::Integer::New(request_id),
     v8::String::New(request->name.c_str()),
     v8::Boolean::New(success),
     converter->ToV8Value(&responseList, request->context->v8_context()),
     v8::String::New(error.c_str())
   };
 
   v8::Handle<v8::Value> retval;
   CHECK(request->context->CallChromeHiddenMethod("handleResponse",
-                                                  arraysize(argv),
-                                                  argv,
-                                                  &retval));
+                                                 arraysize(argv),
+                                                 argv,
+                                                 &retval));
   // In debug, the js will validate the callback parameters and return a
   // string if a validation error has occured.
   if (DCHECK_IS_ON()) {
     if (!retval.IsEmpty() && !retval->IsUndefined()) {
       std::string error = *v8::String::AsciiValue(retval);
       DCHECK(false) << error;
     }
   }
 }
 
 void RequestSender::InvalidateContext(ChromeV8Context* context) {
   for (PendingRequestMap::iterator it = pending_requests_.begin();
        it != pending_requests_.end();) {
     if (it->second->context == context)
       pending_requests_.erase(it++);
     else
       ++it;
   }
 }
 
 }  // namespace extensions