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

extensions/renderer/event_bindings.h

Index: extensions/renderer/event_bindings.h
diff --git a/extensions/renderer/event_bindings.h b/extensions/renderer/event_bindings.h
index f5cfdcf25ea697a8a6deb8c1355ce28b45a3a5a8..0f69cd36edf4f6af562c102a3660d16b21e9a154 100644
--- a/extensions/renderer/event_bindings.h
+++ b/extensions/renderer/event_bindings.h
@@ -5,10 +5,6 @@
 #ifndef EXTENSIONS_RENDERER_EVENT_BINDINGS_H_
 #define EXTENSIONS_RENDERER_EVENT_BINDINGS_H_
 
-#include <set>
-#include <string>
-
-#include "base/macros.h"
 #include "extensions/renderer/object_backed_native_handler.h"
 #include "v8/include/v8.h"
 
@@ -18,6 +14,8 @@
 
 namespace extensions {
 class Dispatcher;
+class EventFilter;
+class EventFilteringInfo;
 class EventMatcher;
 
 // This class deals with the javascript bindings related to Event objects.
@@ -27,25 +25,16 @@
   ~EventBindings() override;
 
  private:
-  // JavaScript handler which forwards to AttachEvent().
-  // args[0] forwards to |event_name|.
-  void AttachEventHandler(const v8::FunctionCallbackInfo<v8::Value>& args);
-
   // Attach an event name to an object.
   // |event_name| The name of the event to attach.
-  void AttachEvent(const std::string& event_name);
+  void AttachEvent(const v8::FunctionCallbackInfo<v8::Value>& args);
 
-  // JavaScript handler which forwards to DetachEvent().
-  // args[0] forwards to |event_name|.
-  // args[1] forwards to |is_manual|.
-  void DetachEventHandler(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  // Detaches an event name from an object.
+  // Detach an event name from an object.
   // |event_name| The name of the event to stop listening to.
   // |is_manual| True if this detach was done by the user via removeListener()
   // as opposed to automatically during shutdown, in which case we should inform
   // the browser we are no longer interested in that event.
-  void DetachEvent(const std::string& event_name, bool is_manual);
+  void DetachEvent(const v8::FunctionCallbackInfo<v8::Value>& args);
 
   // MatcherID AttachFilteredEvent(string event_name, object filter)
   // |event_name| Name of the event to attach.
@@ -62,19 +51,9 @@
 
   void MatchAgainstEventFilter(const v8::FunctionCallbackInfo<v8::Value>& args);
 
+  Dispatcher* dispatcher_;
   scoped_ptr<EventMatcher> ParseEventMatcher(
       base::DictionaryValue* filter_dict);
-
-  // Called when our context, and therefore us, is invalidated. Run any cleanup.
-  void OnInvalidated();
-
-  // The set of attached events. Maintain this so that we can detch them on
-  // unload.
-  std::set<std::string> attached_event_names_;
-
-  Dispatcher* dispatcher_;
-
-  DISALLOW_COPY_AND_ASSIGN(EventBindings);
 };
 
 }  // namespace extensions