Make ExtensionMsg_MessageInvoke run a module system function rather than a

chrome/renderer/extensions/event_unittest.cc

 // 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.
 
 #include "chrome/test/base/module_system_test.h"
 
 #include "grit/renderer_resources.h"
 
 namespace extensions {
 namespace {
 
 class EventUnittest : public ModuleSystemTest {
   virtual void SetUp() OVERRIDE {
     ModuleSystemTest::SetUp();
     module_system_->RunString("chrome = {};", "setup-chrome");
 
     RegisterModule("event", IDR_EVENT_BINDINGS_JS);
     RegisterModule("schemaUtils", IDR_SCHEMA_UTILS_JS);
     RegisterModule("utils", IDR_UTILS_JS);
     RegisterModule("json_schema", IDR_JSON_SCHEMA_JS);
+    RegisterModule("unload_event", IDR_UNLOAD_EVENT_JS);
 
     // Mock out the native handler for event_bindings. These mocks will fail if
     // any invariants maintained by the real event_bindings are broken.
     OverrideNativeHandler("event_bindings",
         "var assert = requireNative('assert');"
         "var attachedListeners = exports.attachedListeners = {};"
         "var attachedFilteredListeners = "
         "    exports.attachedFilteredListeners = {};"
         "var nextId = 0;"
         "var idToName = {};"
@@ skipping 75 matching lines @@
       "var assert = requireNative('assert');"
       "require('event');"
       "var Event = requireNative('chrome').GetChrome().Event;"
       "var eventBindings = requireNative('event_bindings');"
       "var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();"
       "var myEvent = new Event('named-event');"
       "var cb1 = function() {};"
       "var cb2 = function() {};"
       "myEvent.addListener(cb1);"
       "myEvent.addListener(cb2);"
-      "chromeHidden.dispatchOnUnload();"
+      "require('unload_event').dispatch();"
       "assert.AssertFalse(!!eventBindings.attachedListeners['named-event']);");
   module_system_->Require("test");
 }
 
 TEST_F(EventUnittest, OnUnloadDetachesAllListenersEvenDupes) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
   RegisterModule("test",
       "var assert = requireNative('assert');"
       "require('event');"
       "var Event = requireNative('chrome').GetChrome().Event;"
       "var eventBindings = requireNative('event_bindings');"
       "var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();"
       "var myEvent = new Event('named-event');"
       "var cb1 = function() {};"
       "myEvent.addListener(cb1);"
       "myEvent.addListener(cb1);"
-      "chromeHidden.dispatchOnUnload();"
+      "require('unload_event').dispatch();"
       "assert.AssertFalse(!!eventBindings.attachedListeners['named-event']);");
   module_system_->Require("test");
 }
 
 TEST_F(EventUnittest, EventsThatSupportRulesMustHaveAName) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
   RegisterModule("test",
       "require('event');"
       "var Event = requireNative('chrome').GetChrome().Event;"
       "var eventOpts = {supportsRules: true};"
       "var assert = requireNative('assert');"
       "var caught = false;"
       "try {"
       "  var myEvent = new Event(undefined, undefined, eventOpts);"
       "} catch (e) {"
       "  caught = true;"
       "}"
       "assert.AssertTrue(caught);");
   module_system_->Require("test");
 }
 
 TEST_F(EventUnittest, NamedEventDispatch) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
   RegisterModule("test",
-      "require('event');"
+      "var event = require('event');"
       "var Event = requireNative('chrome').GetChrome().Event;"
       "var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();"
       "var assert = requireNative('assert');"
       "var e = new Event('myevent');"
       "var called = false;"
       "e.addListener(function() { called = true; });"
-      "chromeHidden.Event.dispatchEvent('myevent', []);"
+      "event.dispatchEvent('myevent', []);"
       "assert.AssertTrue(called);");
   module_system_->Require("test");
 }
 
 TEST_F(EventUnittest, AddListenerWithFiltersThrowsErrorByDefault) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
   RegisterModule("test",
       "require('event');"
       "var Event = requireNative('chrome').GetChrome().Event;"
       "var assert = requireNative('assert');"
@@ skipping 109 matching lines @@
       "  e.addListener(cb);"
       "} catch (e) {"
       "  caught = true;"
       "}"
       "assert.AssertTrue(caught);");
   module_system_->Require("test");
 }
 
 }  // namespace
 }  // namespace extensions