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

extensions/renderer/module_system.h

 // 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.
 
 #ifndef EXTENSIONS_RENDERER_MODULE_SYSTEM_H_
 #define EXTENSIONS_RENDERER_MODULE_SYSTEM_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 124 matching lines @@
                           const std::string& field,
                           const std::string& module_name,
                           const std::string& module_field);
 
   // Passes exceptions to |handler| rather than console::Fatal.
   void SetExceptionHandlerForTest(scoped_ptr<ExceptionHandler> handler) {
     exception_handler_ = handler.Pass();
   }
 
  protected:
+  friend class ModuleSystemTestEnvironment;
   friend class ScriptContext;
   void Invalidate() override;
 
  private:
   typedef std::map<std::string, linked_ptr<NativeHandler> > NativeHandlerMap;
 
   // Retrieves the lazily defined field specified by |property|.
   static void LazyFieldGetter(v8::Local<v8::String> property,
                               const v8::PropertyCallbackInfo<v8::Value>& info);
   // Retrieves the lazily defined field specified by |property| on a native
@@ skipping 43 matching lines @@
   // Invoked when a module is loaded in response to a requireAsync call.
   // Resolves |resolver| with |value|.
   void OnModuleLoaded(scoped_ptr<v8::Global<v8::Promise::Resolver>> resolver,
                       v8::Handle<v8::Value> value);
 
   // gin::ModuleRegistryObserver overrides.
   void OnDidAddPendingModule(
       const std::string& id,
       const std::vector<std::string>& dependencies) override;
 
+  // Marks any existing NativeHandler named |name| as clobbered.
+  // See |clobbered_native_handlers_|.
+  void ClobberExistingNativeHandler(const std::string& name);
+
   ScriptContext* context_;
 
   // A map from module names to the JS source for that module. GetSource()
   // performs a lookup on this map.
   SourceMap* source_map_;
 
   // A map from native handler names to native handlers.
   NativeHandlerMap native_handler_map_;
 
   // When 0, natives are disabled, otherwise indicates how many callers have
   // pinned natives as enabled.
   int natives_enabled_;
 
   // Called when an exception is thrown but not caught in JS. Overridable by
   // tests.
   scoped_ptr<ExceptionHandler> exception_handler_;
 
+  // A set of native handlers that should actually be require()d as non-native
+  // handlers. This is used for tests to mock out native handlers in JS.
   std::set<std::string> overridden_native_handlers_;
 
+  // A list of NativeHandlers that have been clobbered, either due to
+  // registering a NativeHandler when one was already registered with the same
+  // name, or due to OverrideNativeHandlerForTest. This is needed so that they
+  // can be later Invalidated. It should only happen in tests.
+  std::vector<linked_ptr<NativeHandler>> clobbered_native_handlers_;
+
   base::WeakPtrFactory<ModuleSystem> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ModuleSystem);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_RENDERER_MODULE_SYSTEM_H_