Allow updateArgumentsPostValidate to support callbacks and added / removed arguments.

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 natives = requireNative('sendRequest');
+var validate = require('schemaUtils').validate;
 
 // Callback handling.
 var requests = [];
 chromeHidden.handleResponse = function(requestId, name,
                                        success, response, error) {
   try {
     var request = requests[requestId];
     if (success) {
       delete chrome.extension.lastError;
     } else {
@@ skipping 20 matching lines @@
       // has not provided a callback.
       if (chromeHidden.validateCallbacks && !error) {
         try {
           if (!request.callbackSchema.parameters) {
             throw new Error("No callback schemas defined");
           }
 
           if (request.callbackSchema.parameters.length > 1) {
             throw new Error("Callbacks may only define one parameter");
           }
-          chromeHidden.validate(callbackArgs,
-              request.callbackSchema.parameters);
+          validate(callbackArgs, request.callbackSchema.parameters);
         } catch (exception) {
           return "Callback validation error during " + name + " -- " +
                  exception.stack;
         }
       }
 
       if (typeof(response) != "undefined") {
         request.callback(callbackArgs[0]);
       } else {
         request.callback();
       }
     }
   } finally {
     delete requests[requestId];
     delete chrome.extension.lastError;
   }
 
   return undefined;
 };
 
 function prepareRequest(args, argSchemas) {
   var request = {};
   var argCount = args.length;
 
   // Look for callback param.
   if (argSchemas.length > 0 &&
-      args.length == argSchemas.length &&
       argSchemas[argSchemas.length - 1].type == "function") {
-    request.callback = args[argSchemas.length - 1];
+    request.callback = args[args.length - 1];
     request.callbackSchema = argSchemas[argSchemas.length - 1];
     --argCount;
   }
 
   request.args = [];
   for (var k = 0; k < argCount; k++) {
     request.args[k] = args[k];
   }
 
   return request;
@@ skipping 31 matching lines @@
   var requestId = natives.GetNextRequestId();
   request.id = requestId;
   requests[requestId] = request;
   var hasCallback =
       (request.callback || opt_args.customCallback) ? true : false;
   return nativeFunction(functionName, requestArgs, requestId, hasCallback,
                         opt_args.forIOThread);
 }
 
 exports.sendRequest = sendRequest;