Extension activity log database refactoring (step 3)

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/activity_log/api_actions.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_dependency_manager.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h"
 
 class Profile;
@@ skipping 28 matching lines @@
   // If you want to know whether the log is enabled but DON'T have a profile
   // object yet, use this method. However, it's preferable for the caller to
   // use IsLogEnabled when possible.
   static bool IsLogEnabledOnAnyProfile();
 
   // Add/remove observer: the activityLogPrivate API only listens when the
   // ActivityLog extension is registered for an event.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
+  // Logs an extension action: passes it to any installed policy to be logged
+  // to the database, to any observers, and logs to the console if in testing
+  // mode.
+  //
+  // The convenience Log*Action methods below can be used as well if the caller
+  // does not wish to construct the Action object itself, however those methods
+  // are somewhat deprecated.
+  void LogAction(scoped_refptr<Action> action);
+
+  // TODO(mvrable): The calls below take args as a raw pointer, but the callee
+  // does not own the object so these should more properly be a const pointer.
+  // The callee is forced to make a copy of the object which in some cases is
+  // wasteful, and it could be better to take a scoped_ptr as input.  Switching
+  // to using LogAction is another way to clean this up.
+
   // Log a successful API call made by an extension.
   // This will create an APIAction for storage in the database.
   // (Note: implemented as a wrapper for LogAPIActionInternal.)
   void LogAPIAction(const std::string& extension_id,
                     const std::string& name,    // e.g., tabs.get
                     base::ListValue* args,      // the argument values e.g. 46
                     const std::string& extra);  // any extra logging info
 
   // Log an event notification delivered to an extension.
   // This will create an APIAction for storage in the database.
@@ skipping 162 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_