Attempting to fix problems in 11571014.

chrome/renderer/resources/extensions/send_request.js

 // 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.
 
 var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
 var DCHECK = requireNative('logging').DCHECK;
 var json = require('json');
 var lastError = require('lastError');
 var natives = requireNative('sendRequest');
 var validate = require('schemaUtils').validate;
 
+// All outstanding requests from sendRequest().
+var requests = {};
+
 // Callback handling.
-var requests = [];
 chromeHidden.handleResponse = function(requestId, name,
                                        success, responseList, error) {
+  var request = requests[requestId];

[Matt Perry, 2013/03/05 21:51:38]

Why pull all this out of the try? Might as well be safe and keep it all in there
in case any of this throws.

[not at google - send to devlin, 2013/03/05 22:05:38]

I pulled this out because the finally{} block references callerChrome, which
only makes sense if it's assigned outside the try scope. I'll do it in 2 stages.

Done.

+  delete requests[requestId];
+  DCHECK(request != null);
+
+  // lastError needs to be set on the caller's global object, which may not
+  // necessarily be ours.
+  var callerChrome = natives.GetGlobal(
+      request.callback || request.customCallback || chrome).chrome;

[Matt Perry, 2013/03/05 21:51:38]

does GetGlobal() return the global object, or chrome? lastError.run() seems to
expect it to return chrome.

[not at google - send to devlin, 2013/03/05 22:05:38]

Yeah, chrome. There is a .chrome at the end of the natives.GetGlobal there, but
I'll move it to be more explicit.

+
   try {
-    var request = requests[requestId];
-    DCHECK(request != null);
-    if (success) {
-      lastError.clear();
-    } else {
-      if (!error) {
+    lastError.clear(callerChrome);
+    if (!success) {
+      if (!error)
         error = "Unknown error.";
-      }
-      console.error("Error during " + name + ": " + error);
-      lastError.set(error);
+      lastError.set(error, callerChrome);
     }
 
     if (request.customCallback) {
       var customCallbackArgs = [name, request].concat(responseList);
       request.customCallback.apply(request, customCallbackArgs);
     }
 
     if (request.callback) {
       // Validate callback in debug only -- and only when the
       // caller has provided a callback. Implementations of api
       // calls may not return data if they observe the caller
       // has not provided a callback.
       if (chromeHidden.validateCallbacks && !error) {
         try {
           if (!request.callbackSchema.parameters) {
             throw new Error("No callback schemas defined");
           }
 
           validate(responseList, request.callbackSchema.parameters);
         } catch (exception) {
           return "Callback validation error during " + name + " -- " +
                  exception.stack;
         }
       }
 
       request.callback.apply(request, responseList);
     }
   } finally {
-    delete requests[requestId];
-    lastError.clear();
+    lastError.clear(callerChrome);
   }
-
-  return undefined;
 };
 
 function prepareRequest(args, argSchemas) {
   var request = {};
   var argCount = args.length;
 
   // Look for callback param.
   if (argSchemas.length > 0 &&
       argSchemas[argSchemas.length - 1].type == "function") {
     request.callback = args[args.length - 1];
@@ skipping 34 matching lines @@
   // v8 values instead of expecting JSON strings.
   var doStringify = false;
   if (optArgs.nativeFunction && !optArgs.noStringify)
     doStringify = true;
   var requestArgs = doStringify ? json.stringify(request.args) : request.args;
   var nativeFunction = optArgs.nativeFunction || natives.StartRequest;
 
   var requestId = natives.GetNextRequestId();
   request.id = requestId;
   requests[requestId] = request;
+
   var hasCallback = request.callback || optArgs.customCallback;
   return nativeFunction(functionName,
                         requestArgs,
                         requestId,
                         hasCallback,
                         optArgs.forIOThread,
                         optArgs.preserveNullInObjects);
 }
 
 exports.sendRequest = sendRequest;