Making webRequest.addEventListener internal

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();
@@ skipping 46 matching lines @@
 // info is sent to the callback.
 WebRequestEvent.prototype.addListener =
     function(cb, opt_filter, opt_extraInfo) {
   if (!this.eventOptions_.supportsListeners)
     throw new Error('This event does not support listeners.');
   var subEventName = GetUniqueSubEventName(this.eventName_);
   // Note: this could fail to validate, in which case we would not add the
   // subEvent listener.
   chromeHidden.validate(Array.prototype.slice.call(arguments, 1),
                         this.extraArgSchemas_);
-  chrome.webRequest.addEventListener(
+  chromeHidden.internalAPIs.webRequestInternal.addEventListener(
       cb, opt_filter, opt_extraInfo, this.eventName_, subEventName);
 
   var subEvent = new chrome.Event(subEventName, this.argSchemas_);
   var subEventCallback = cb;
   if (opt_extraInfo && opt_extraInfo.indexOf('blocking') >= 0) {
     var eventName = this.eventName_;
     subEventCallback = function() {
       var requestId = arguments[0].requestId;
       try {
         var result = cb.apply(null, arguments);
@@ skipping 67 matching lines @@
   if (!this.eventOptions_.supportsRules)
     throw new Error('This event does not support rules.');
   this.eventForRules_.getRules(ruleIdentifiers, cb);
 }
 
 chromeHidden.registerCustomEvent('webRequest', WebRequestEvent);
 
 chromeHidden.registerCustomHook('webRequest', function(api) {
   var apiFunctions = api.apiFunctions;
 
-  apiFunctions.setHandleRequest('addEventListener', function() {
-    var args = Array.prototype.slice.call(arguments);
-    sendRequest(this.name, args, this.definition.parameters,
-                {forIOThread: true});
-  });
-
   apiFunctions.setHandleRequest('eventHandled', function() {
     var args = Array.prototype.slice.call(arguments);
     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});
+  });
+});
+
+chromeHidden.registerCustomHook('webRequestInternal', function(api) {

[battre, 2012/05/15 09:23:38]

I think this should go into web_request_internal_custom_bindings.js for
consistency reasons.

[vabr (Chromium), 2012/05/15 11:57:52]

Done.

+  var apiFunctions = api.apiFunctions;
+
+  apiFunctions.setHandleRequest('addEventListener', function() {
+    var args = Array.prototype.slice.call(arguments);
+    sendRequest(this.name, args, this.definition.parameters,
+                {forIOThread: true});
   });
 });