Move declarative API into events API

chrome/renderer/resources/extensions/web_request_custom_bindings.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.
 
 // Custom bindings for the webRequest API.
 
 var webRequestNatives = requireNative('web_request');
 var GetUniqueSubEventName = webRequestNatives.GetUniqueSubEventName;
 
 var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
 var sendRequest = require('sendRequest').sendRequest;
 
 // WebRequestEvent object. This is used for special webRequest events with
 // extra parameters. Each invocation of addListener creates a new named
 // sub-event. That sub-event is associated with the extra parameters in the
 // browser process, so that only it is dispatched when the main event occurs
 // matching the extra parameters.
 //
 // Example:
 //   chrome.webRequest.onBeforeRequest.addListener(
 //       callback, {urls: 'http://*.google.com/*'});
 //   ^ callback will only be called for onBeforeRequests matching the filter.
 function WebRequestEvent(eventName, opt_argSchemas, opt_extraArgSchemas,
-                         opt_eventOptions) {
+                         opt_eventOptions, opt_eventsSchema) {
   if (typeof eventName != 'string')
     throw new Error('chrome.WebRequestEvent requires an event name.');
 
   this.eventName_ = eventName;
   this.argSchemas_ = opt_argSchemas;
   this.extraArgSchemas_ = opt_extraArgSchemas;
   this.subEvents_ = [];
   this.eventOptions_ = opt_eventOptions ||
       {'supportsListeners': true, 'supportsRules': false};
 
-  if (this.eventOptions_.supportsRules)
+  if (this.eventOptions_.supportsRules) {
     this.eventForRules_ =
-        new chrome.Event(eventName, opt_argSchemas, opt_eventOptions);
+        new chrome.Event(eventName, opt_argSchemas, opt_eventOptions,
+                         opt_eventsSchema);

[not at google - send to devlin, 2012/05/10 09:01:25]

nit: 1 line or vertical arguments

(I can see that other lines don't adhere to this... eh.)

+  }
 };
 
 // Test if the given callback is registered for this event.
 WebRequestEvent.prototype.hasListener = function(cb) {
   if (!this.eventOptions_.supportsListeners)
     throw new Error('This event does not support listeners.');
   return this.findListener_(cb) > -1;
 };
 
 // Test if any callbacks are registered fur thus event.
@@ skipping 115 matching lines @@
     sendRequest(this.name, args, this.definition.parameters,
                 {forIOThread: true});
   });
 
   apiFunctions.setHandleRequest('handlerBehaviorChanged', function() {
     var args = Array.prototype.slice.call(arguments);
     sendRequest(this.name, args, this.definition.parameters,
                 {forIOThread: true});
   });
 });