Revert "Allow declarative webrequest and webrequest in extensions."

extensions/renderer/resources/web_view_events.js

 // Copyright 2014 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.
 
 // Event management for WebViewInternal.
 
-var DeclarativeWebRequestSchema =
-    requireNative('schema_registry').GetSchema('declarativeWebRequest');
 var EventBindings = require('event_bindings');
-var IdGenerator = requireNative('id_generator');
 var MessagingNatives = requireNative('messaging_natives');
-var WebRequestEvent = require('webRequestInternal').WebRequestEvent;
-var WebRequestSchema =
-    requireNative('schema_registry').GetSchema('webRequest');
 var WebView = require('webViewInternal').WebView;
 
 var CreateEvent = function(name) {
   var eventOpts = {supportsListeners: true, supportsFilters: true};
   return new EventBindings.Event(name, undefined, eventOpts);
 };
 
 var FrameNameChangedEvent = CreateEvent('webViewInternal.onFrameNameChanged');
 var PluginDestroyedEvent = CreateEvent('webViewInternal.onPluginDestroyed');
-var WebRequestMessageEvent = CreateEvent('webViewInternal.onMessage');
 
 // WEB_VIEW_EVENTS is a map of stable <webview> DOM event names to their
 //     associated extension event descriptor objects.
 // An event listener will be attached to the extension event |evt| specified in
 //     the descriptor.
 // |fields| specifies the public-facing fields in the DOM event that are
 //     accessible to <webview> developers.
 // |customHandler| allows a handler function to be called each time an extension
 //     event is caught by its event listener. The DOM event should be dispatched
 //     within this handler function. With no handler function, the DOM event
@@ skipping 113 matching lines @@
   'unresponsive': {
     evt: CreateEvent('webViewInternal.onUnresponsive'),
     fields: ['processId']
   },
   'zoomchange': {
     evt: CreateEvent('webViewInternal.onZoomChange'),
     fields: ['oldZoomFactor', 'newZoomFactor']
   }
 };
 
-function DeclarativeWebRequestEvent(opt_eventName,
-                                    opt_argSchemas,
-                                    opt_eventOptions,
-                                    opt_webViewInstanceId) {
-  var subEventName = opt_eventName + '/' + IdGenerator.GetNextId();
-  EventBindings.Event.call(this, subEventName, opt_argSchemas, opt_eventOptions,
-      opt_webViewInstanceId);
-
-  // TODO(lazyboy): When do we dispose this listener?
-  WebRequestMessageEvent.addListener(function() {
-    // Re-dispatch to subEvent's listeners.
-    $Function.apply(this.dispatch, this, $Array.slice(arguments));
-  }.bind(this), {instanceId: opt_webViewInstanceId || 0});
-}
-
-DeclarativeWebRequestEvent.prototype = {
-  __proto__: EventBindings.Event.prototype
-};
-
 // Constructor.
 function WebViewEvents(webViewInternal, viewInstanceId) {
   this.webViewInternal = webViewInternal;
   this.viewInstanceId = viewInstanceId;
   this.setup();
 }
 
 // Sets up events.
 WebViewEvents.prototype.setup = function() {
   this.setupFrameNameChangedEvent();
   this.setupPluginDestroyedEvent();
-  this.setupWebRequestEvents();
+  this.webViewInternal.maybeSetupChromeWebViewEvents();
   this.webViewInternal.setupExperimentalContextMenus();
 
   var events = this.getEvents();
   for (var eventName in events) {
     this.setupEvent(eventName, events[eventName]);
   }
 };
 
 WebViewEvents.prototype.setupFrameNameChangedEvent = function() {
   FrameNameChangedEvent.addListener(function(e) {
     this.webViewInternal.onFrameNameChanged(e.name);
   }.bind(this), {instanceId: this.viewInstanceId});
 };
 
 WebViewEvents.prototype.setupPluginDestroyedEvent = function() {
   PluginDestroyedEvent.addListener(function(e) {
     this.webViewInternal.onPluginDestroyed();
   }.bind(this), {instanceId: this.viewInstanceId});
 };
 
-WebViewEvents.prototype.setupWebRequestEvents = function() {
-  var request = {};
-  var createWebRequestEvent = function(webRequestEvent) {
-    return function() {
-      if (!this[webRequestEvent.name]) {
-        this[webRequestEvent.name] =
-            new WebRequestEvent(
-                'webViewInternal.' + webRequestEvent.name,
-                webRequestEvent.parameters,
-                webRequestEvent.extraParameters, webRequestEvent.options,
-                this.viewInstanceId);
-      }
-      return this[webRequestEvent.name];
-    }.bind(this);
-  }.bind(this);
-
-  var createDeclarativeWebRequestEvent = function(webRequestEvent) {
-    return function() {
-      if (!this[webRequestEvent.name]) {
-        // The onMessage event gets a special event type because we want
-        // the listener to fire only for messages targeted for this particular
-        // <webview>.
-        var EventClass = webRequestEvent.name === 'onMessage' ?
-            DeclarativeWebRequestEvent : EventBindings.Event;
-        this[webRequestEvent.name] =
-            new EventClass(
-                'webViewInternal.' + webRequestEvent.name,
-                webRequestEvent.parameters,
-                webRequestEvent.options,
-                this.viewInstanceId);
-      }
-      return this[webRequestEvent.name];
-    }.bind(this);
-  }.bind(this);
-
-  for (var i = 0; i < DeclarativeWebRequestSchema.events.length; ++i) {
-    var eventSchema = DeclarativeWebRequestSchema.events[i];
-    var webRequestEvent = createDeclarativeWebRequestEvent(eventSchema);
-    Object.defineProperty(
-        request,
-        eventSchema.name,
-        {
-          get: webRequestEvent,
-          enumerable: true
-        }
-    );
-  }
-
-  // Populate the WebRequest events from the API definition.
-  for (var i = 0; i < WebRequestSchema.events.length; ++i) {
-    var webRequestEvent = createWebRequestEvent(WebRequestSchema.events[i]);
-    Object.defineProperty(
-        request,
-        WebRequestSchema.events[i].name,
-        {
-          get: webRequestEvent,
-          enumerable: true
-        }
-    );
-  }
-
-  this.webViewInternal.setRequestPropertyOnWebViewNode(request);
-};
-
 WebViewEvents.prototype.getEvents = function() {
   var experimentalEvents = this.webViewInternal.maybeGetExperimentalEvents();
   for (var eventName in experimentalEvents) {
     WEB_VIEW_EVENTS[eventName] = experimentalEvents[eventName];
   }
   var chromeEvents = this.webViewInternal.maybeGetChromeWebViewEvents();
   for (var eventName in chromeEvents) {
     WEB_VIEW_EVENTS[eventName] = chromeEvents[eventName];
   }
   return WEB_VIEW_EVENTS;
@@ skipping 330 matching lines @@
   }
 };
 
 WebViewEvents.prototype.handleSizeChangedEvent = function(
     event, webViewEvent) {
   this.webViewInternal.onSizeChanged(webViewEvent);
 };
 
 exports.WebViewEvents = WebViewEvents;
 exports.CreateEvent = CreateEvent;