Make miscellaneous_bindings and event_bindings Required as needed. Previously

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("event_bindings", IDR_EVENT_BINDINGS_JS);
     RegisterModule("schemaUtils", IDR_SCHEMA_UTILS_JS);
     RegisterModule("utils", IDR_UTILS_JS);
     RegisterModule("json_schema", IDR_JSON_SCHEMA_JS);
+    RegisterModule("on_unload", IDR_ON_UNLOAD_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",
+    OverrideNativeHandler("event_natives",
         "var assert = requireNative('assert');"
         "var attachedListeners = exports.attachedListeners = {};"
         "var attachedFilteredListeners = "
         "    exports.attachedFilteredListeners = {};"
         "var nextId = 0;"
         "var idToName = {};"
 
         "exports.AttachEvent = function(eventName) {"
         "  assert.AssertFalse(!!attachedListeners[eventName]);"
         "  attachedListeners[eventName] = 1;"
@@ skipping 43 matching lines @@
 };
 
 TEST_F(EventUnittest, TestNothing) {
   ExpectNoAssertionsMade();
 }
 
 TEST_F(EventUnittest, AddRemoveTwoListeners) {
   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 Event = require('event_bindings').Event;"
+      "var eventNatives = requireNative('event_natives');"
       "var myEvent = new Event('named-event');"
       "var cb1 = function() {};"
       "var cb2 = function() {};"
       "myEvent.addListener(cb1);"
       "myEvent.addListener(cb2);"
       "myEvent.removeListener(cb1);"
-      "assert.AssertTrue(!!eventBindings.attachedListeners['named-event']);"
+      "assert.AssertTrue(!!eventNatives.attachedListeners['named-event']);"
       "myEvent.removeListener(cb2);"
-      "assert.AssertFalse(!!eventBindings.attachedListeners['named-event']);");
+      "assert.AssertFalse(!!eventNatives.attachedListeners['named-event']);");
   module_system_->Require("test");
 }
 
 TEST_F(EventUnittest, OnUnloadDetachesAllListeners) {
   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 Event = require('event_bindings').Event;"
+      "var eventNatives = requireNative('event_natives');"
+      "var onUnload = require('on_unload');"
       "var myEvent = new Event('named-event');"
       "var cb1 = function() {};"
       "var cb2 = function() {};"
       "myEvent.addListener(cb1);"
       "myEvent.addListener(cb2);"
-      "chromeHidden.dispatchOnUnload();"
-      "assert.AssertFalse(!!eventBindings.attachedListeners['named-event']);");
+      "onUnload.dispatch();"
+      "assert.AssertFalse(!!eventNatives.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 Event = require('event_bindings').Event;"
+      "var eventNatives = requireNative('event_natives');"
+      "var onUnload = require('on_unload');"
       "var myEvent = new Event('named-event');"
       "var cb1 = function() {};"
       "myEvent.addListener(cb1);"
       "myEvent.addListener(cb1);"
-      "chromeHidden.dispatchOnUnload();"
-      "assert.AssertFalse(!!eventBindings.attachedListeners['named-event']);");
+      "onUnload.dispatch();"
+      "assert.AssertFalse(!!eventNatives.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 Event = require('event_bindings').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 = requireNative('chrome').GetChrome().Event;"
-      "var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();"
+      "var Event = require('event_bindings').Event;"
+      "var dispatchEvent = require('event_bindings').dispatchEvent;"
       "var assert = requireNative('assert');"
       "var e = new Event('myevent');"
       "var called = false;"
       "e.addListener(function() { called = true; });"
-      "chromeHidden.Event.dispatchEvent('myevent', []);"
+      "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 Event = require('event_bindings').Event;"
       "var assert = requireNative('assert');"
       "var e = new Event('myevent');"
       "var filter = [{"
       "  url: {hostSuffix: 'google.com'},"
       "}];"
       "var caught = false;"
       "try {"
       "  e.addListener(function() {}, filter);"
       "} catch (e) {"
       "  caught = true;"
       "}"
       "assert.AssertTrue(caught);");
   module_system_->Require("test");
 }
 
 TEST_F(EventUnittest, FilteredEventsAttachment) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
   RegisterModule("test",
-      "require('event');"
-      "var Event = requireNative('chrome').GetChrome().Event;"
+      "var Event = require('event_bindings').Event;"
       "var assert = requireNative('assert');"
-      "var bindings = requireNative('event_bindings');"
+      "var bindings = requireNative('event_natives');"
       "var eventOpts = {supportsListeners: true, supportsFilters: true};"
       "var e = new Event('myevent', undefined, eventOpts);"
       "var cb = function() {};"
       "var filters = {url: [{hostSuffix: 'google.com'}]};"
       "e.addListener(cb, filters);"
       "assert.AssertTrue(bindings.HasFilteredListener('myevent'));"
       "e.removeListener(cb);"
       "assert.AssertFalse(bindings.HasFilteredListener('myevent'));");
   module_system_->Require("test");
 }
 
 TEST_F(EventUnittest, DetachFilteredEvent) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
   RegisterModule("test",
-      "require('event');"
-      "var Event = requireNative('chrome').GetChrome().Event;"
+      "var Event = require('event_bindings').Event;"
       "var assert = requireNative('assert');"
-      "var bindings = requireNative('event_bindings');"
+      "var bindings = requireNative('event_natives');"
       "var eventOpts = {supportsListeners: true, supportsFilters: true};"
       "var e = new Event('myevent', undefined, eventOpts);"
       "var cb1 = function() {};"
       "var cb2 = function() {};"
       "var filters = {url: [{hostSuffix: 'google.com'}]};"
       "e.addListener(cb1, filters);"
       "e.addListener(cb2, filters);"
       "e.detach_();"
       "assert.AssertFalse(bindings.HasFilteredListener('myevent'));");
   module_system_->Require("test");
 }
 
 TEST_F(EventUnittest, AttachAndRemoveSameFilteredEventListener) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
   RegisterModule("test",
-      "require('event');"
-      "var Event = requireNative('chrome').GetChrome().Event;"
+      "var Event = require('event_bindings').Event;"
       "var assert = requireNative('assert');"
-      "var bindings = requireNative('event_bindings');"
+      "var bindings = requireNative('event_natives');"
       "var eventOpts = {supportsListeners: true, supportsFilters: true};"
       "var e = new Event('myevent', undefined, eventOpts);"
       "var cb = function() {};"
       "var filters = {url: [{hostSuffix: 'google.com'}]};"
       "e.addListener(cb, filters);"
       "e.addListener(cb, filters);"
       "assert.AssertTrue(bindings.HasFilteredListener('myevent'));"
       "e.removeListener(cb);"
       "assert.AssertTrue(bindings.HasFilteredListener('myevent'));"
       "e.removeListener(cb);"
       "assert.AssertFalse(bindings.HasFilteredListener('myevent'));");
   module_system_->Require("test");
 }
 
 TEST_F(EventUnittest, AddingFilterWithUrlFieldNotAListThrowsException) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
   RegisterModule("test",
-      "require('event');"
-      "var Event = requireNative('chrome').GetChrome().Event;"
+      "var Event = require('event_bindings').Event;"
       "var assert = requireNative('assert');"
       "var eventOpts = {supportsListeners: true, supportsFilters: true};"
       "var e = new Event('myevent', undefined, eventOpts);"
       "var cb = function() {};"
       "var filters = {url: {hostSuffix: 'google.com'}};"
       "var caught = false;"
       "try {"
       "  e.addListener(cb, filters);"
       "} catch (e) {"
       "  caught = true;"
       "}"
       "assert.AssertTrue(caught);");
   module_system_->Require("test");
 }
 
 TEST_F(EventUnittest, MaxListeners) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
   RegisterModule("test",
-      "require('event');"
-      "var Event = requireNative('chrome').GetChrome().Event;"
+      "var Event = require('event_bindings').Event;"
       "var assert = requireNative('assert');"
       "var eventOpts = {supportsListeners: true, maxListeners: 1};"
       "var e = new Event('myevent', undefined, eventOpts);"
       "var cb = function() {};"
       "var caught = false;"
       "try {"
       "  e.addListener(cb);"
       "} catch (e) {"
       "  caught = true;"
       "}"
       "assert.AssertTrue(!caught);"
       "try {"
       "  e.addListener(cb);"
       "} catch (e) {"
       "  caught = true;"
       "}"
       "assert.AssertTrue(caught);");
   module_system_->Require("test");
 }
 
 }  // namespace
 }  // namespace extensions