Revert 184837

chrome/renderer/extensions/event_unittest.cc

Index: chrome/renderer/extensions/event_unittest.cc
===================================================================
--- chrome/renderer/extensions/event_unittest.cc	(revision 184858)
+++ chrome/renderer/extensions/event_unittest.cc	(working copy)
@@ -62,9 +62,6 @@
     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",
@@ -82,10 +79,9 @@
   ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
   RegisterModule("test",
       "var assert = requireNative('assert');"
-      "require('event');"
-      "var Event = requireNative('chrome').GetChrome().Event;"
+      "var event = require('event');"
       "var eventBindings = requireNative('event_bindings');"
-      "var myEvent = new Event('named-event');"
+      "var myEvent = new event.Event('named-event');"
       "var cb1 = function() {};"
       "var cb2 = function() {};"
       "myEvent.addListener(cb1);"
@@ -101,11 +97,10 @@
   ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
   RegisterModule("test",
       "var assert = requireNative('assert');"
-      "require('event');"
-      "var Event = requireNative('chrome').GetChrome().Event;"
+      "var event = require('event');"
       "var eventBindings = requireNative('event_bindings');"
       "var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();"
-      "var myEvent = new Event('named-event');"
+      "var myEvent = new event.Event('named-event');"
       "var cb1 = function() {};"
       "var cb2 = function() {};"
       "myEvent.addListener(cb1);"
@@ -119,11 +114,10 @@
   ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
   RegisterModule("test",
       "var assert = requireNative('assert');"
-      "require('event');"
-      "var Event = requireNative('chrome').GetChrome().Event;"
+      "var event = require('event');"
       "var eventBindings = requireNative('event_bindings');"
       "var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();"
-      "var myEvent = new Event('named-event');"
+      "var myEvent = new event.Event('named-event');"
       "var cb1 = function() {};"
       "myEvent.addListener(cb1);"
       "myEvent.addListener(cb1);"
@@ -135,13 +129,12 @@
 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');"
       "var eventOpts = {supportsRules: true};"
       "var assert = requireNative('assert');"
       "var caught = false;"
       "try {"
-      "  var myEvent = new Event(undefined, undefined, eventOpts);"
+      "  var myEvent = new event.Event(undefined, undefined, eventOpts);"
       "} catch (e) {"
       "  caught = true;"
       "}"
@@ -152,11 +145,10 @@
 TEST_F(EventUnittest, NamedEventDispatch) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
   RegisterModule("test",
-      "require('event');"
-      "var Event = requireNative('chrome').GetChrome().Event;"
+      "var event = require('event');"
       "var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();"
       "var assert = requireNative('assert');"
-      "var e = new Event('myevent');"
+      "var e = new event.Event('myevent');"
       "var called = false;"
       "e.addListener(function() { called = true; });"
       "chromeHidden.Event.dispatchEvent('myevent', []);"
@@ -167,10 +159,9 @@
 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');"
       "var assert = requireNative('assert');"
-      "var e = new Event('myevent');"
+      "var e = new event.Event('myevent');"
       "var filter = [{"
       "  url: {hostSuffix: 'google.com'},"
       "}];"
@@ -187,12 +178,11 @@
 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');"
       "var assert = requireNative('assert');"
       "var bindings = requireNative('event_bindings');"
       "var eventOpts = {supportsListeners: true, supportsFilters: true};"
-      "var e = new Event('myevent', undefined, eventOpts);"
+      "var e = new event.Event('myevent', undefined, eventOpts);"
       "var cb = function() {};"
       "var filters = {url: [{hostSuffix: 'google.com'}]};"
       "e.addListener(cb, filters);"
@@ -205,12 +195,11 @@
 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');"
       "var assert = requireNative('assert');"
       "var bindings = requireNative('event_bindings');"
       "var eventOpts = {supportsListeners: true, supportsFilters: true};"
-      "var e = new Event('myevent', undefined, eventOpts);"
+      "var e = new event.Event('myevent', undefined, eventOpts);"
       "var cb1 = function() {};"
       "var cb2 = function() {};"
       "var filters = {url: [{hostSuffix: 'google.com'}]};"
@@ -224,12 +213,11 @@
 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');"
       "var assert = requireNative('assert');"
       "var bindings = requireNative('event_bindings');"
       "var eventOpts = {supportsListeners: true, supportsFilters: true};"
-      "var e = new Event('myevent', undefined, eventOpts);"
+      "var e = new event.Event('myevent', undefined, eventOpts);"
       "var cb = function() {};"
       "var filters = {url: [{hostSuffix: 'google.com'}]};"
       "e.addListener(cb, filters);"
@@ -245,11 +233,10 @@
 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');"
       "var assert = requireNative('assert');"
       "var eventOpts = {supportsListeners: true, supportsFilters: true};"
-      "var e = new Event('myevent', undefined, eventOpts);"
+      "var e = new event.Event('myevent', undefined, eventOpts);"
       "var cb = function() {};"
       "var filters = {url: {hostSuffix: 'google.com'}};"
       "var caught = false;"
@@ -265,11 +252,10 @@
 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');"
       "var assert = requireNative('assert');"
       "var eventOpts = {supportsListeners: true, maxListeners: 1};"
-      "var e = new Event('myevent', undefined, eventOpts);"
+      "var e = new event.Event('myevent', undefined, eventOpts);"
       "var cb = function() {};"
       "var caught = false;"
       "try {"