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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11571014: Lazy load chrome.* APIs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed comments Created 7 years, 10 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
« chrome/renderer/extensions/dispatcher.cc ('K') | « chrome/renderer/extensions/dispatcher.cc ('k') | chrome/renderer/extensions/extension_helper.h » ('j') | chrome/renderer/extensions/module_system.cc » ('J')
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 edd47c0fc04e26407e159fac7bd4ad08af3b5086..1ba318772ba1a70c9958a77de3303592c41be172 100644
--- a/chrome/renderer/extensions/event_unittest.cc
+++ b/chrome/renderer/extensions/event_unittest.cc
@@ -62,6 +62,9 @@ class EventUnittest : public ModuleSystemTest {
OverrideNativeHandler("chrome_hidden",
"var chromeHidden = {};"
"exports.GetChromeHidden = function() { return chromeHidden; };");
+ OverrideNativeHandler("chrome",
+ "var chrome = {};"
+ "exports.GetChrome = function() { return chrome; };");
OverrideNativeHandler("sendRequest",
"exports.sendRequest = function() {};");
OverrideNativeHandler("apiDefinitions",
@@ -79,9 +82,9 @@ TEST_F(EventUnittest, AddRemoveTwoListeners) {
ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
RegisterModule("test",
"var assert = requireNative('assert');"
- "var event = require('event');"
+ "var Event = require('event').bindings;"
"var eventBindings = requireNative('event_bindings');"
- "var myEvent = new event.Event('named-event');"
+ "var myEvent = new Event('named-event');"
"var cb1 = function() {};"
"var cb2 = function() {};"
"myEvent.addListener(cb1);"
@@ -97,10 +100,10 @@ TEST_F(EventUnittest, OnUnloadDetachesAllListeners) {
ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
RegisterModule("test",
"var assert = requireNative('assert');"
- "var event = require('event');"
+ "var Event = require('event').bindings;"
"var eventBindings = requireNative('event_bindings');"
"var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();"
- "var myEvent = new event.Event('named-event');"
+ "var myEvent = new Event('named-event');"
"var cb1 = function() {};"
"var cb2 = function() {};"
"myEvent.addListener(cb1);"
@@ -114,10 +117,10 @@ TEST_F(EventUnittest, OnUnloadDetachesAllListenersEvenDupes) {
ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
RegisterModule("test",
"var assert = requireNative('assert');"
- "var event = require('event');"
+ "var Event = require('event').bindings;"
"var eventBindings = requireNative('event_bindings');"
"var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();"
- "var myEvent = new event.Event('named-event');"
+ "var myEvent = new Event('named-event');"
"var cb1 = function() {};"
"myEvent.addListener(cb1);"
"myEvent.addListener(cb1);"
@@ -129,12 +132,12 @@ TEST_F(EventUnittest, OnUnloadDetachesAllListenersEvenDupes) {
TEST_F(EventUnittest, EventsThatSupportRulesMustHaveAName) {
ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
RegisterModule("test",
- "var event = require('event');"
+ "var Event = require('event').bindings;"
"var eventOpts = {supportsRules: true};"
"var assert = requireNative('assert');"
"var caught = false;"
"try {"
- " var myEvent = new event.Event(undefined, undefined, eventOpts);"
+ " var myEvent = new Event(undefined, undefined, eventOpts);"
"} catch (e) {"
" caught = true;"
"}"
@@ -145,10 +148,10 @@ TEST_F(EventUnittest, EventsThatSupportRulesMustHaveAName) {
TEST_F(EventUnittest, NamedEventDispatch) {
ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
RegisterModule("test",
- "var event = require('event');"
+ "var Event = require('event').bindings;"
"var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();"
"var assert = requireNative('assert');"
- "var e = new event.Event('myevent');"
+ "var e = new Event('myevent');"
"var called = false;"
"e.addListener(function() { called = true; });"
"chromeHidden.Event.dispatchEvent('myevent', []);"
@@ -159,9 +162,9 @@ TEST_F(EventUnittest, NamedEventDispatch) {
TEST_F(EventUnittest, AddListenerWithFiltersThrowsErrorByDefault) {
ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
RegisterModule("test",
- "var event = require('event');"
+ "var Event = require('event').bindings;"
"var assert = requireNative('assert');"
- "var e = new event.Event('myevent');"
+ "var e = new Event('myevent');"
"var filter = [{"
" url: {hostSuffix: 'google.com'},"
"}];"
@@ -178,11 +181,11 @@ TEST_F(EventUnittest, AddListenerWithFiltersThrowsErrorByDefault) {
TEST_F(EventUnittest, FilteredEventsAttachment) {
ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
RegisterModule("test",
- "var event = require('event');"
+ "var Event = require('event').bindings;"
"var assert = requireNative('assert');"
"var bindings = requireNative('event_bindings');"
"var eventOpts = {supportsListeners: true, supportsFilters: true};"
- "var e = new event.Event('myevent', undefined, eventOpts);"
+ "var e = new Event('myevent', undefined, eventOpts);"
"var cb = function() {};"
"var filters = {url: [{hostSuffix: 'google.com'}]};"
"e.addListener(cb, filters);"
@@ -195,11 +198,11 @@ TEST_F(EventUnittest, FilteredEventsAttachment) {
TEST_F(EventUnittest, DetachFilteredEvent) {
ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
RegisterModule("test",
- "var event = require('event');"
+ "var Event = require('event').bindings;"
"var assert = requireNative('assert');"
"var bindings = requireNative('event_bindings');"
"var eventOpts = {supportsListeners: true, supportsFilters: true};"
- "var e = new event.Event('myevent', undefined, eventOpts);"
+ "var e = new Event('myevent', undefined, eventOpts);"
"var cb1 = function() {};"
"var cb2 = function() {};"
"var filters = {url: [{hostSuffix: 'google.com'}]};"
@@ -213,11 +216,11 @@ TEST_F(EventUnittest, DetachFilteredEvent) {
TEST_F(EventUnittest, AttachAndRemoveSameFilteredEventListener) {
ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
RegisterModule("test",
- "var event = require('event');"
+ "var Event = require('event').bindings;"
"var assert = requireNative('assert');"
"var bindings = requireNative('event_bindings');"
"var eventOpts = {supportsListeners: true, supportsFilters: true};"
- "var e = new event.Event('myevent', undefined, eventOpts);"
+ "var e = new Event('myevent', undefined, eventOpts);"
"var cb = function() {};"
"var filters = {url: [{hostSuffix: 'google.com'}]};"
"e.addListener(cb, filters);"
@@ -233,10 +236,10 @@ TEST_F(EventUnittest, AttachAndRemoveSameFilteredEventListener) {
TEST_F(EventUnittest, AddingFilterWithUrlFieldNotAListThrowsException) {
ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
RegisterModule("test",
- "var event = require('event');"
+ "var Event = require('event').bindings;"
"var assert = requireNative('assert');"
"var eventOpts = {supportsListeners: true, supportsFilters: true};"
- "var e = new event.Event('myevent', undefined, eventOpts);"
+ "var e = new Event('myevent', undefined, eventOpts);"
"var cb = function() {};"
"var filters = {url: {hostSuffix: 'google.com'}};"
"var caught = false;"
@@ -252,10 +255,10 @@ TEST_F(EventUnittest, AddingFilterWithUrlFieldNotAListThrowsException) {
TEST_F(EventUnittest, MaxListeners) {
ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
RegisterModule("test",
- "var event = require('event');"
+ "var Event = require('event').bindings;"
"var assert = requireNative('assert');"
"var eventOpts = {supportsListeners: true, maxListeners: 1};"
- "var e = new event.Event('myevent', undefined, eventOpts);"
+ "var e = new Event('myevent', undefined, eventOpts);"
"var cb = function() {};"
"var caught = false;"
"try {"
« chrome/renderer/extensions/dispatcher.cc ('K') | « chrome/renderer/extensions/dispatcher.cc ('k') | chrome/renderer/extensions/extension_helper.h » ('j') | chrome/renderer/extensions/module_system.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698