Add ApiActivityMonitor to decouple ActivityLog from low-level extensions code

extensions/browser/event_router.h

Index: extensions/browser/event_router.h
diff --git a/extensions/browser/event_router.h b/extensions/browser/event_router.h
index a42aa680d2ece4c5fd8ba455e14452d5700ad162..467e7f396ae21729ec89f52da81891a043be9d34 100644
--- a/extensions/browser/event_router.h
+++ b/extensions/browser/event_router.h
@@ -68,13 +68,6 @@ class EventRouter : public content::NotificationObserver,
     virtual void OnListenerRemoved(const EventListenerInfo& details) {}
   };
 
-  // The EventDispatchObserver is notified on the UI thread whenever
-  // an event is dispatched. There can be only one EventDispatchObserver.
-  class EventDispatchObserver {
-   public:
-    virtual void OnWillDispatchEvent(scoped_ptr<EventDispatchInfo> details) = 0;
-  };
-
   // Converts event names like "foo.onBar/123" into "foo.onBar". Event names
   // without a "/" are returned unchanged.
   static std::string GetBaseEventName(const std::string& full_event_name);
@@ -117,10 +110,6 @@ class EventRouter : public content::NotificationObserver,
   // Unregisters an observer from all events.
   void UnregisterObserver(Observer* observer);
 
-  // Sets the observer to be notified whenever an event is dispatched to an
-  // extension.
-  void SetEventDispatchObserver(EventDispatchObserver* observer);
-
   // Add or remove the extension as having a lazy background page that listens
   // to the event. The difference from the above methods is that these will be
   // remembered even after the process goes away. We use this list to decide
@@ -192,12 +181,6 @@ class EventRouter : public content::NotificationObserver,
   typedef std::pair<const content::BrowserContext*, std::string>
       EventDispatchIdentifier;
 
-  // Sends a notification about an event to the event dispatch observer on the
-  // UI thread. Can be called from any thread.
-  static void NotifyExtensionDispatchObserverOnUIThread(
-      void* browser_context_id,
-      scoped_ptr<EventDispatchInfo> details);
-
   // TODO(gdk): Document this.
   static void DispatchExtensionMessage(
       IPC::Sender* ipc_sender,
@@ -300,8 +283,6 @@ class EventRouter : public content::NotificationObserver,
   typedef base::hash_map<std::string, Observer*> ObserverMap;
   ObserverMap observers_;
 
-  EventDispatchObserver* event_dispatch_observer_;
-
   DISALLOW_COPY_AND_ASSIGN(EventRouter);
 };
 
@@ -377,17 +358,6 @@ struct EventListenerInfo {
   content::BrowserContext* browser_context;
 };
 
-struct EventDispatchInfo {
-  EventDispatchInfo(const std::string& extension_id,
-                    const std::string& event_name,
-                    scoped_ptr<base::ListValue> event_args);
-  ~EventDispatchInfo();
-
-  const std::string extension_id;
-  const std::string event_name;
-  scoped_ptr<base::ListValue> event_args;
-};
-
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_EVENT_ROUTER_H_