Make ExtensionMsg_MessageInvoke run a module system function rather than a

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 DCHECK = requireNative('logging').DCHECK;
   // TODO(cduvall/kalman): json_schema shouldn't put things on chromeHidden.
   require('json_schema');
   var eventBindingsNatives = requireNative('event_bindings');
   var AttachEvent = eventBindingsNatives.AttachEvent;
   var DetachEvent = eventBindingsNatives.DetachEvent;
   var AttachFilteredEvent = eventBindingsNatives.AttachFilteredEvent;
   var DetachFilteredEvent = eventBindingsNatives.DetachFilteredEvent;
   var MatchAgainstEventFilter = eventBindingsNatives.MatchAgainstEventFilter;
   var forEach = require('utils').forEach;
   var sendRequest = require('sendRequest').sendRequest;
   var utils = require('utils');
   var validate = require('schemaUtils').validate;
+  var unloadEvent = require('unload_event');
 
   var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
   var chrome = requireNative('chrome').GetChrome();
   var schemaRegistry = requireNative('schema_registry');
 
   // 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 165 matching lines @@
   // dispatchEvent(), and dispatch is a function(args) that dispatches args to
   // its listeners.
   chromeHidden.Event.registerArgumentMassager = function(name, callback) {
     if (eventArgumentMassagers[name])
       throw new Error("Massager already registered for event: " + name);
     eventArgumentMassagers[name] = callback;
   };
 
   // Dispatches a named event with the given argument array. The args array is
   // the list of arguments that will be sent to the event callback.
-  chromeHidden.Event.dispatchEvent = function(name, args, filteringInfo) {
+  function dispatchEvent(name, args, filteringInfo) {
     var listenerIDs = null;
 
     if (filteringInfo)
       listenerIDs = MatchAgainstEventFilter(name, filteringInfo);
 
     var event = attachedNamedEvents[name];
     if (!event)
       return;
 
     var dispatchArgs = function(args) {
       var result = event.dispatch_(args, listenerIDs);
       if (result)
         DCHECK(!result.validationErrors, result.validationErrors);
       return result;
     };
 
     if (eventArgumentMassagers[name])
       eventArgumentMassagers[name](args, dispatchArgs);
     else
       dispatchArgs(args);
-  };
-
-  // Test if a named event has any listeners.
-  chromeHidden.Event.hasListener = function(name) {
-    return (attachedNamedEvents[name] &&
-            attachedNamedEvents[name].listeners_.length > 0);
-  };
+  }
 
   // Registers a callback to be called when this event is dispatched.
   Event.prototype.addListener = function(cb, filters) {
     if (!this.eventOptions_.supportsListeners)
       throw new Error("This event does not support listeners.");
     if (this.eventOptions_.maxListeners &&
         this.getListenerCount() >= this.eventOptions_.maxListeners)
       throw new Error("Too many listeners for " + this.eventName_);
     if (filters) {
       if (!this.eventOptions_.supportsFilters)
@@ skipping 202 matching lines @@
     // We remove the first parameter from the validation to give the user more
     // meaningful error messages.
     validate([ruleIdentifiers, cb],
              ruleFunctionSchemas.getRules.parameters.slice().splice(1));
 
     sendRequest("events.getRules",
                 [this.eventName_, ruleIdentifiers, cb],
                 ruleFunctionSchemas.getRules.parameters);
   }
 
-  // Special load events: we don't use the DOM unload because that slows
-  // down tab shutdown.  On the other hand, onUnload might not always fire,
-  // since Chrome will terminate renderers on shutdown (SuddenTermination).
-  chromeHidden.onUnload = new Event();
-
-  chromeHidden.dispatchOnUnload = function() {
-    chromeHidden.onUnload.dispatch();
-    chromeHidden.wasUnloaded = true;
-
+  unloadEvent.addListener(function() {
     for (var i = 0; i < allAttachedEvents.length; ++i) {
       var event = allAttachedEvents[i];
       if (event)
         event.detach_();
     }
-  };
+  });
 
   chrome.Event = Event;
+  exports.dispatchEvent = dispatchEvent;