Move the event attach/detach logic on unload from event.js to

extensions/renderer/event_unittest.cc

 // Copyright 2014 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 "extensions/common/extension_urls.h"
 #include "extensions/renderer/module_system_test.h"
 #include "grit/extensions_renderer_resources.h"
 
 namespace extensions {
 namespace {
 
 class EventUnittest : public ModuleSystemTest {
   void SetUp() override {
     ModuleSystemTest::SetUp();
 
     env()->RegisterModule(kEventBindings, IDR_EVENT_BINDINGS_JS);
     env()->RegisterModule("json_schema", IDR_JSON_SCHEMA_JS);
     env()->RegisterModule(kSchemaUtils, IDR_SCHEMA_UTILS_JS);
     env()->RegisterModule("uncaught_exception_handler",
                           IDR_UNCAUGHT_EXCEPTION_HANDLER_JS);
-    env()->RegisterModule("unload_event", IDR_UNLOAD_EVENT_JS);
     env()->RegisterModule("utils", IDR_UTILS_JS);
 
     // Mock out the native handler for event_bindings. These mocks will fail if
     // any invariants maintained by the real event_bindings are broken.
     env()->OverrideNativeHandler(
         "event_natives",
         "var assert = requireNative('assert');"
         "var attachedListeners = exports.attachedListeners = {};"
         "var attachedFilteredListeners = "
         "    exports.attachedFilteredListeners = {};"
@@ skipping 53 matching lines @@
       "var cb2 = function() {};"
       "myEvent.addListener(cb1);"
       "myEvent.addListener(cb2);"
       "myEvent.removeListener(cb1);"
       "assert.AssertTrue(!!eventNatives.attachedListeners['named-event']);"
       "myEvent.removeListener(cb2);"
       "assert.AssertFalse(!!eventNatives.attachedListeners['named-event']);");
   env()->module_system()->Require("test");
 }
 
-TEST_F(EventUnittest, OnUnloadDetachesAllListeners) {
-  ModuleSystem::NativesEnabledScope natives_enabled_scope(
-      env()->module_system());
-  env()->RegisterModule(
-      "test",
-      "var assert = requireNative('assert');"
-      "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);"
-      "require('unload_event').dispatch();"
-      "assert.AssertFalse(!!eventNatives.attachedListeners['named-event']);");
-  env()->module_system()->Require("test");
-}
-
-TEST_F(EventUnittest, OnUnloadDetachesAllListenersEvenDupes) {
-  ModuleSystem::NativesEnabledScope natives_enabled_scope(
-      env()->module_system());
-  env()->RegisterModule(
-      "test",
-      "var assert = requireNative('assert');"
-      "var Event = require('event_bindings').Event;"
-      "var eventNatives = requireNative('event_natives');"
-      "var myEvent = new Event('named-event');"
-      "var cb1 = function() {};"
-      "myEvent.addListener(cb1);"
-      "myEvent.addListener(cb1);"
-      "require('unload_event').dispatch();"
-      "assert.AssertFalse(!!eventNatives.attachedListeners['named-event']);");
-  env()->module_system()->Require("test");
-}
-
 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 {"
@@ skipping 144 matching lines @@
       "  e.addListener(cb);"
       "} catch (e) {"
       "  caught = true;"
       "}"
       "assert.AssertTrue(caught);");
   env()->module_system()->Require("test");
 }
 
 }  // namespace
 }  // namespace extensions