Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/extensions/event_unittest.cc

Issue 15841013: Make miscellaneous_bindings and event_bindings Required as needed. Previously (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/extensions/dispatcher.cc ('k') | chrome/renderer/extensions/extension_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/extensions/event_unittest.cc
diff --git a/chrome/renderer/extensions/event_unittest.cc b/chrome/renderer/extensions/event_unittest.cc
index ff6aedbb34f77d9f26aff57f0d877545f8b65a0a..b578b912bc7a4dd83233a2e8fa22b9d35625a963 100644
--- a/chrome/renderer/extensions/event_unittest.cc
+++ b/chrome/renderer/extensions/event_unittest.cc
@@ -14,14 +14,15 @@ class EventUnittest : public ModuleSystemTest {
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 = "
@@ -85,18 +86,17 @@ 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");
}
@@ -104,17 +104,16 @@ 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");
}
@@ -122,24 +121,22 @@ 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;"
@@ -155,14 +152,13 @@ TEST_F(EventUnittest, EventsThatSupportRulesMustHaveAName) {
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");
}
@@ -170,8 +166,7 @@ TEST_F(EventUnittest, NamedEventDispatch) {
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 = [{"
@@ -190,10 +185,9 @@ TEST_F(EventUnittest, AddListenerWithFiltersThrowsErrorByDefault) {
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() {};"
@@ -208,10 +202,9 @@ TEST_F(EventUnittest, FilteredEventsAttachment) {
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() {};"
@@ -227,10 +220,9 @@ TEST_F(EventUnittest, DetachFilteredEvent) {
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() {};"
@@ -248,8 +240,7 @@ TEST_F(EventUnittest, AttachAndRemoveSameFilteredEventListener) {
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);"
@@ -268,8 +259,7 @@ TEST_F(EventUnittest, AddingFilterWithUrlFieldNotAListThrowsException) {
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);"
« no previous file with comments | « chrome/renderer/extensions/dispatcher.cc ('k') | chrome/renderer/extensions/extension_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698