Alter the ActivityLog db table schemas.

chrome/browser/extensions/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_H_
 #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 54 matching lines @@
   // Add/remove observer.
   void AddObserver(const Extension* extension, Observer* observer);
   void RemoveObserver(const Extension* extension,
                       Observer* observer);
 
   // Check for the existence observer list by extension_id.
   bool HasObservers(const Extension* extension) const;
 
   // 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 Extension* extension,
                     const std::string& name,    // e.g., tabs.get
                     const 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.
+  // (Note: implemented as a wrapper for LogAPIActionInternal.)
   void LogEventAction(const Extension* extension,
                       const std::string& name,    // e.g., tabs.onUpdate
                       const ListValue* args,      // arguments to the callback
                       const std::string& extra);  // any extra logging info
 
   // Log a blocked API call made by an extension.
   // This will create a BlockedAction for storage in the database.
   void LogBlockedAction(const Extension* extension,
                         const std::string& blocked_call,  // e.g., tabs.get
                         const ListValue* args,            // argument values
                         const char* reason,               // why it's blocked
                         const std::string& extra);        // extra logging info
 
   // Log an interaction between an extension and a URL.
-  // This will create a UrlAction for storage in the database.
+  // This will create a DOMAction for storage in the database.
   // The technical message might be the list of content scripts that have been
   // injected, or the DOM API call; it's what's shown under "More".
-  void LogUrlAction(const Extension* extension,
-                    const UrlAction::UrlActionType verb,  // e.g., XHR
+  void LogDOMAction(const Extension* extension,
                     const GURL& url,                      // target URL
-                    const string16& url_title,            // title of the URL,
-                                                          // can be empty string
-                    const std::string& technical_message, // "More"
+                    const string16& url_title,            // title of the URL
+                    const std::string& api_call,          // api call
+                    const ListValue* args,                // arguments
                     const std::string& extra);            // extra logging info
 
   // An error has happened; we want to rollback and close the db.
   // Needs to be public so the error delegate can call it.
   void KillActivityLogDatabase();
 
  private:
   friend class ActivityLogFactory;
 
   explicit ActivityLog(Profile* profile);
   virtual ~ActivityLog();
 
+  // We log callbacks and API calls very similarly, so we handle them the same
+  // way internally.
+  void LogAPIActionInternal(
+      const Extension* extension,
+      const std::string& api_call,
+      const ListValue* args,
+      const std::string& extra,
+      const APIAction::Type type);
+
+  // We log content script injection and DOM API calls using the same underlying
+  // mechanism, so they have the same internal logging structure.
+  void LogDOMActionInternal(const Extension* extension,
+                            const GURL& url,
+                            const string16& url_title,
+                            const std::string& api_call,
+                            const ListValue* args,
+                            const std::string& extra,
+                            DOMAction::DOMActionType verb);
+
   // TabHelper::ScriptExecutionObserver implementation.
   // Fires when a ContentScript is executed.
   virtual void OnScriptsExecuted(
       const content::WebContents* web_contents,
       const ExecutingScriptsMap& extension_ids,
       int32 page_id,
       const GURL& on_url) OVERRIDE;
 
   // The callback when initializing the database.
   void OnDBInitComplete();
@@ skipping 65 matching lines @@
 
   virtual bool ServiceRedirectedInIncognito() const OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(ActivityLogFactory);
 };
 
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_H_