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

extensions/renderer/module_system_test.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/renderer/module_system_test.h"
 
 #include <map>
 #include <string>
 
 #include "base/callback.h"
@@ skipping 178 matching lines @@
   std::string test_js;
   ASSERT_TRUE(base::ReadFileToString(test_js_file_path, &test_js));
   source_map_->RegisterModule(module_name, test_js);
 }
 
 void ModuleSystemTestEnvironment::ShutdownGin() {
   context_holder_.reset();
 }
 
 void ModuleSystemTestEnvironment::ShutdownModuleSystem() {
+  context_->module_system()->Invalidate();
   context_->v8_context()->Exit();
   context_->Invalidate();
 }
 
 v8::Handle<v8::Object> ModuleSystemTestEnvironment::CreateGlobal(
     const std::string& name) {
   v8::EscapableHandleScope handle_scope(isolate_);
   v8::Local<v8::Object> object = v8::Object::New(isolate_);
   isolate_->GetCurrentContext()->Global()->Set(
       v8::String::NewFromUtf8(isolate_, name.c_str()), object);
@@ skipping 37 matching lines @@
 
 void ModuleSystemTest::ExpectNoAssertionsMade() {
   should_assertions_be_made_ = false;
 }
 
 void ModuleSystemTest::RunResolvedPromises() {
   isolate_->RunMicrotasks();
 }
 
 }  // namespace extensions