Allow updateArgumentsPostValidate to support callbacks and added / removed arguments.

chrome/renderer/resources/extensions/event.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 eventBindingsNatives = requireNative('event_bindings');
   var AttachEvent = eventBindingsNatives.AttachEvent;
   var DetachEvent = eventBindingsNatives.DetachEvent;
   var sendRequest = require('sendRequest').sendRequest;
   var utils = require('utils');
+  var validate = require('schemaUtils').validate;
 
   var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
   var GetExtensionAPIDefinition =
       requireNative('apiDefinitions').GetExtensionAPIDefinition;
 
   // Schemas for the rule-style functions on the events API that
   // only need to be generated occasionally, so populate them lazily.
   var ruleFunctionSchemas = {
     // These values are set lazily:
     // addRules: {},
@@ skipping 72 matching lines @@
     this.listeners_ = [];
     this.eventOptions_ = opt_eventOptions ||
         {"supportsListeners": true, "supportsRules": false};
 
     if (this.eventOptions_.supportsRules && !opt_eventName)
       throw new Error("Events that support rules require an event name.");
 
     // Validate event arguments (the data that is passed to the callbacks)
     // if we are in debug.
     if (opt_argSchemas &&
-        chromeHidden.validateCallbacks &&
-        chromeHidden.validate) {
+        chromeHidden.validateCallbacks) {
 
       this.validateEventArgs_ = function(args) {
         try {
-          chromeHidden.validate(args, opt_argSchemas);
+          validate(args, opt_argSchemas);
         } catch (exception) {
           return "Event validation error during " + opt_eventName + " -- " +
                  exception;
         }
       };
     } else {
       this.validateEventArgs_ = function() {}
     }
   };
 
@@ skipping 181 matching lines @@
     // event object type.
     // |rules| is an array of JSON objects that follow the Rule type of the
     // declarative extension APIs. |conditions| is an array of JSON type
     // identifiers that are allowed to occur in the conditions attribute of each
     // rule. Likewise, |actions| is an array of JSON type identifiers that are
     // allowed to occur in the actions attribute of each rule.
     function validateRules(rules, conditions, actions) {
       var conditionsSchema = buildArrayOfChoicesSchema(conditions);
       var actionsSchema = buildArrayOfChoicesSchema(actions);
       rules.forEach(function(rule) {
-        chromeHidden.validate([rule.conditions], [conditionsSchema]);
-        chromeHidden.validate([rule.actions], [actionsSchema]);
+        validate([rule.conditions], [conditionsSchema]);
+        validate([rule.actions], [actionsSchema]);
       })
     };
 
     if (!this.eventOptions_.conditions || !this.eventOptions_.actions) {
       throw new Error('Event ' + this.eventName_ + ' misses conditions or ' +
                 'actions in the API specification.');
     }
 
     validateRules(rules,
                   this.eventOptions_.conditions,
@@ skipping 38 matching lines @@
       if (event)
         event.detach_(false);
     }
   };
 
   chromeHidden.dispatchError = function(msg) {
     console.error(msg);
   };
 
   exports.Event = chrome.Event;