Add ApiActivityMonitor to decouple ActivityLog from low-level extensions code

chrome/browser/extensions/activity_log/activity_log.h

 // Copyright (c) 2012 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 CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_H_
 #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list_threadsafe.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/extensions/activity_log/activity_actions.h"
-#include "chrome/browser/extensions/activity_log/activity_database.h"
 #include "chrome/browser/extensions/activity_log/activity_log_policy.h"
 #include "chrome/browser/extensions/install_observer.h"
-#include "chrome/browser/extensions/install_tracker.h"
 #include "chrome/browser/extensions/tab_helper.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/dom_action_types.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h"
-#include "extensions/browser/event_router.h"
+#include "extensions/browser/api_activity_monitor.h"
 
 class Profile;
-using content::BrowserThread;
 
 namespace content {
 class BrowserContext;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace extensions {
 class Extension;
-class ActivityLogPolicy;
+class InstallTracker;
 
 // A utility for tracing interesting activity for each extension.
 // It writes to an ActivityDatabase on a separate thread to record the activity.
 class ActivityLog : public BrowserContextKeyedService,
-                    public EventRouter::EventDispatchObserver,
+                    public ApiActivityMonitor,
                     public TabHelper::ScriptExecutionObserver,
                     public InstallObserver {
  public:
   // Observers can listen for activity events. There is probably only one
   // observer: the activityLogPrivate API.
   class Observer {
    public:
     virtual void OnExtensionActivity(scoped_refptr<Action> activity) = 0;
   };
 
@@ skipping 36 matching lines @@
   virtual void OnBeginExtensionInstall(
       const ExtensionInstallParams& params) OVERRIDE {}
   virtual void OnDownloadProgress(const std::string& extension_id,
                                   int percent_downloaded) OVERRIDE {}
   virtual void OnInstallFailure(const std::string& extension_id) OVERRIDE {}
   virtual void OnAppsReordered() OVERRIDE {}
   virtual void OnAppInstalledToAppList(
       const std::string& extension_id) OVERRIDE {}
   virtual void OnShutdown() OVERRIDE {}
 
-  // EventRouter::EventDispatchObserver
-  virtual void OnWillDispatchEvent(scoped_ptr<EventDispatchInfo> details)
-      OVERRIDE;
+  // ApiActivityMonitor
+  virtual void OnApiEventDispatched(
+      const std::string& extension_id,
+      const std::string& event_name,
+      scoped_ptr<base::ListValue> event_args) OVERRIDE;
+  virtual void OnApiFunctionCalled(
+      const std::string& extension_id,
+      const std::string& api_name,
+      scoped_ptr<base::ListValue> event_args) OVERRIDE;
 
   // BrowserContextKeyedService
   virtual void Shutdown() OVERRIDE;
 
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
   // Clean up URLs from the activity log database.
   // If restrict_urls is empty then all URLs in the activity log database are
   // removed, otherwise only those in restrict_urls are removed.
   void RemoveURLs(const std::vector<GURL>& restrict_urls);
@@ skipping 114 matching lines @@
   virtual content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(ActivityLogFactory);
 };
 
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_H_