Index: extensions/renderer/event_unittest.cc |
diff --git a/extensions/renderer/event_unittest.cc b/extensions/renderer/event_unittest.cc |
index 9d3b68f0014980dffae42b48e934db200af85446..06398bd54d729eaf544a088013f26277b24fb695 100644 |
--- a/extensions/renderer/event_unittest.cc |
+++ b/extensions/renderer/event_unittest.cc |
@@ -79,7 +79,7 @@ TEST_F(EventUnittest, AddRemoveTwoListeners) { |
"var assert = requireNative('assert');" |
"var Event = require('event_bindings').Event;" |
"var eventNatives = requireNative('event_natives');" |
- "var myEvent = new Event('named-event');" |
+ "var myEvent = new Event(events::UNKNOWN, 'named-event');" |
"var cb1 = function() {};" |
"var cb2 = function() {};" |
"myEvent.addListener(cb1);" |
@@ -94,18 +94,18 @@ TEST_F(EventUnittest, AddRemoveTwoListeners) { |
TEST_F(EventUnittest, EventsThatSupportRulesMustHaveAName) { |
ModuleSystem::NativesEnabledScope natives_enabled_scope( |
env()->module_system()); |
- env()->RegisterModule( |
- "test", |
- "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);"); |
+ env()->RegisterModule("test", |
+ "var Event = require('event_bindings').Event;" |
+ "var eventOpts = {supportsRules: true};" |
+ "var assert = requireNative('assert');" |
+ "var caught = false;" |
+ "try {" |
+ " var myEvent = new Event(events::UNKNOWN, undefined, " |
+ "undefined, eventOpts);" |
+ "} catch (e) {" |
+ " caught = true;" |
+ "}" |
+ "assert.AssertTrue(caught);"); |
env()->module_system()->Require("test"); |
} |
@@ -117,7 +117,7 @@ TEST_F(EventUnittest, NamedEventDispatch) { |
"var Event = require('event_bindings').Event;" |
"var dispatchEvent = require('event_bindings').dispatchEvent;" |
"var assert = requireNative('assert');" |
- "var e = new Event('myevent');" |
+ "var e = new Event(events::UNKNOWN, 'myevent');" |
"var called = false;" |
"e.addListener(function() { called = true; });" |
"dispatchEvent('myevent', []);" |
@@ -131,7 +131,7 @@ TEST_F(EventUnittest, AddListenerWithFiltersThrowsErrorByDefault) { |
env()->RegisterModule("test", |
"var Event = require('event_bindings').Event;" |
"var assert = requireNative('assert');" |
- "var e = new Event('myevent');" |
+ "var e = new Event(events::UNKNOWN, 'myevent');" |
"var filter = [{" |
" url: {hostSuffix: 'google.com'}," |
"}];" |
@@ -154,7 +154,7 @@ TEST_F(EventUnittest, FilteredEventsAttachment) { |
"var assert = requireNative('assert');" |
"var bindings = requireNative('event_natives');" |
"var eventOpts = {supportsListeners: true, supportsFilters: true};" |
- "var e = new Event('myevent', undefined, eventOpts);" |
+ "var e = new Event(events::UNKNOWN, 'myevent', undefined, eventOpts);" |
"var cb = function() {};" |
"var filters = {url: [{hostSuffix: 'google.com'}]};" |
"e.addListener(cb, filters);" |
@@ -173,7 +173,7 @@ TEST_F(EventUnittest, DetachFilteredEvent) { |
"var assert = requireNative('assert');" |
"var bindings = requireNative('event_natives');" |
"var eventOpts = {supportsListeners: true, supportsFilters: true};" |
- "var e = new Event('myevent', undefined, eventOpts);" |
+ "var e = new Event(events::UNKNOWN, 'myevent', undefined, eventOpts);" |
"var cb1 = function() {};" |
"var cb2 = function() {};" |
"var filters = {url: [{hostSuffix: 'google.com'}]};" |
@@ -193,7 +193,7 @@ TEST_F(EventUnittest, AttachAndRemoveSameFilteredEventListener) { |
"var assert = requireNative('assert');" |
"var bindings = requireNative('event_natives');" |
"var eventOpts = {supportsListeners: true, supportsFilters: true};" |
- "var e = new Event('myevent', undefined, eventOpts);" |
+ "var e = new Event(events::UNKNOWN, 'myevent', undefined, eventOpts);" |
"var cb = function() {};" |
"var filters = {url: [{hostSuffix: 'google.com'}]};" |
"e.addListener(cb, filters);" |
@@ -214,7 +214,7 @@ TEST_F(EventUnittest, AddingFilterWithUrlFieldNotAListThrowsException) { |
"var Event = require('event_bindings').Event;" |
"var assert = requireNative('assert');" |
"var eventOpts = {supportsListeners: true, supportsFilters: true};" |
- "var e = new Event('myevent', undefined, eventOpts);" |
+ "var e = new Event(events::UNKNOWN, 'myevent', undefined, eventOpts);" |
"var cb = function() {};" |
"var filters = {url: {hostSuffix: 'google.com'}};" |
"var caught = false;" |
@@ -235,7 +235,7 @@ TEST_F(EventUnittest, MaxListeners) { |
"var Event = require('event_bindings').Event;" |
"var assert = requireNative('assert');" |
"var eventOpts = {supportsListeners: true, maxListeners: 1};" |
- "var e = new Event('myevent', undefined, eventOpts);" |
+ "var e = new Event(events::UNKNOWN, 'myevent', undefined, eventOpts);" |
"var cb = function() {};" |
"var caught = false;" |
"try {" |