Revert 184837

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 binding for the webRequest API.
-
-var binding = require('binding').Binding.create('webRequest');
+// 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;
 var validate = require('schemaUtils').validate;
-var webRequestInternal = require('webRequestInternal').binding;
 
 // 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/*'});
@@ skipping 33 matching lines @@
 // match the given filters. If opt_extraInfo is specified, the given optional
 // 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.
   validate(Array.prototype.slice.call(arguments, 1), this.extraArgSchemas_);
-  webRequestInternal.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);
-        webRequestInternal.eventHandled(
+        chromeHidden.internalAPIs.webRequestInternal.eventHandled(
             eventName, subEventName, requestId, result);
       } catch (e) {
-        webRequestInternal.eventHandled(
+        chromeHidden.internalAPIs.webRequestInternal.eventHandled(
             eventName, subEventName, requestId);
         throw e;
       }
     };
   } else if (opt_extraInfo && opt_extraInfo.indexOf('asyncBlocking') >= 0) {
     var eventName = this.eventName_;
     subEventCallback = function() {
       var details = arguments[0];
       var requestId = details.requestId;
       var handledCallback = function(response) {
-        webRequestInternal.eventHandled(
+        chromeHidden.internalAPIs.webRequestInternal.eventHandled(
             eventName, subEventName, requestId, response);
       };
       cb.apply(null, [details, handledCallback]);
     };
   }
   this.subEvents_.push(
       {subEvent: subEvent, callback: cb, subEventCallback: subEventCallback});
   subEvent.addListener(subEventCallback);
 };
 
@@ skipping 37 matching lines @@
     throw new Error('This event does not support rules.');
   this.eventForRules_.removeRules(ruleIdentifiers, opt_cb);
 }
 
 WebRequestEvent.prototype.getRules = function(ruleIdentifiers, cb) {
   if (!this.eventOptions_.supportsRules)
     throw new Error('This event does not support rules.');
   this.eventForRules_.getRules(ruleIdentifiers, cb);
 }
 
-binding.registerCustomEvent(WebRequestEvent);
+chromeHidden.registerCustomEvent('webRequest', WebRequestEvent);
 
-binding.registerCustomHook(function(api) {
+chromeHidden.registerCustomHook('webRequest', function(api) {
   var apiFunctions = api.apiFunctions;
 
   apiFunctions.setHandleRequest('handlerBehaviorChanged', function() {
     var args = Array.prototype.slice.call(arguments);
     sendRequest(this.name, args, this.definition.parameters,
                 {forIOThread: true});
   });
 });
-
-exports.binding = binding.generate();