Enables Activity Log to extract URLs from URL assignment API calls

chrome/browser/extensions/activity_log/activity_log.cc

Index: chrome/browser/extensions/activity_log/activity_log.cc
diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc
index 6fc02361fc4cfd51f973abcdfe3c7c2deb4046d4..9cdbae03413e5c102ecdfdeb14c82e1f84a94d05 100644
--- a/chrome/browser/extensions/activity_log/activity_log.cc
+++ b/chrome/browser/extensions/activity_log/activity_log.cc
@@ -92,46 +92,64 @@ struct ApiInfo {
 };
 
 static const ApiInfo kApiInfoTable[] = {
-  // Tabs APIs that require tab ID translation
-  {Action::ACTION_API_CALL, "tabs.connect", 0, LOOKUP_TAB_ID, NULL},
-  {Action::ACTION_API_CALL, "tabs.detectLanguage", 0, LOOKUP_TAB_ID, NULL},
-  {Action::ACTION_API_CALL, "tabs.duplicate", 0, LOOKUP_TAB_ID, NULL},
-  {Action::ACTION_API_CALL, "tabs.executeScript", 0, LOOKUP_TAB_ID, NULL},
-  {Action::ACTION_API_CALL, "tabs.get", 0, LOOKUP_TAB_ID, NULL},
-  {Action::ACTION_API_CALL, "tabs.insertCSS", 0, LOOKUP_TAB_ID, NULL},
-  {Action::ACTION_API_CALL, "tabs.move", 0, LOOKUP_TAB_ID, NULL},
-  {Action::ACTION_API_CALL, "tabs.reload", 0, LOOKUP_TAB_ID, NULL},
-  {Action::ACTION_API_CALL, "tabs.remove", 0, LOOKUP_TAB_ID, NULL},
-  {Action::ACTION_API_CALL, "tabs.sendMessage", 0, LOOKUP_TAB_ID, NULL},
-  {Action::ACTION_API_CALL, "tabs.update", 0, LOOKUP_TAB_ID, NULL},
-
-  {Action::ACTION_API_EVENT, "tabs.onUpdated", 0, LOOKUP_TAB_ID, NULL},
-  {Action::ACTION_API_EVENT, "tabs.onMoved", 0, LOOKUP_TAB_ID, NULL},
-  {Action::ACTION_API_EVENT, "tabs.onDetached", 0, LOOKUP_TAB_ID, NULL},
-  {Action::ACTION_API_EVENT, "tabs.onAttached", 0, LOOKUP_TAB_ID, NULL},
-  {Action::ACTION_API_EVENT, "tabs.onRemoved", 0, LOOKUP_TAB_ID, NULL},
-  {Action::ACTION_API_EVENT, "tabs.onReplaced", 0, LOOKUP_TAB_ID, NULL},
-
-  // Other APIs that accept URLs as strings
-  {Action::ACTION_API_CALL, "bookmarks.create", 0, DICT_LOOKUP, "url"},
-  {Action::ACTION_API_CALL, "bookmarks.update", 1, DICT_LOOKUP, "url"},
-  {Action::ACTION_API_CALL, "cookies.get", 0, DICT_LOOKUP, "url"},
-  {Action::ACTION_API_CALL, "cookies.getAll", 0, DICT_LOOKUP, "url"},
-  {Action::ACTION_API_CALL, "cookies.remove", 0, DICT_LOOKUP, "url"},
-  {Action::ACTION_API_CALL, "cookies.set", 0, DICT_LOOKUP, "url"},
-  {Action::ACTION_API_CALL, "downloads.download", 0, DICT_LOOKUP, "url"},
-  {Action::ACTION_API_CALL, "history.addUrl", 0, DICT_LOOKUP, "url"},
-  {Action::ACTION_API_CALL, "history.deleteUrl", 0, DICT_LOOKUP, "url"},
-  {Action::ACTION_API_CALL, "history.getVisits", 0, DICT_LOOKUP, "url"},
-  {Action::ACTION_API_CALL, "webstore.install", 0, NONE, NULL},
-  {Action::ACTION_API_CALL, "windows.create", 0, DICT_LOOKUP, "url"},
-
-  {Action::ACTION_DOM_ACCESS, "Document.location", 0, NONE, NULL},
-  {Action::ACTION_DOM_ACCESS, "Location.assign", 0, NONE, NULL},
-  {Action::ACTION_DOM_ACCESS, "Location.replace", 0, NONE, NULL},
-  {Action::ACTION_DOM_ACCESS, "Window.location", 0, NONE, NULL},
-  {Action::ACTION_DOM_ACCESS, "XMLHttpRequest.open", 1, NONE, NULL},
-};
+    // Tabs APIs that require tab ID translation
+    {Action::ACTION_API_CALL, "tabs.connect", 0, LOOKUP_TAB_ID, NULL},
+    {Action::ACTION_API_CALL, "tabs.detectLanguage", 0, LOOKUP_TAB_ID, NULL},
+    {Action::ACTION_API_CALL, "tabs.duplicate", 0, LOOKUP_TAB_ID, NULL},
+    {Action::ACTION_API_CALL, "tabs.executeScript", 0, LOOKUP_TAB_ID, NULL},
+    {Action::ACTION_API_CALL, "tabs.get", 0, LOOKUP_TAB_ID, NULL},
+    {Action::ACTION_API_CALL, "tabs.insertCSS", 0, LOOKUP_TAB_ID, NULL},
+    {Action::ACTION_API_CALL, "tabs.move", 0, LOOKUP_TAB_ID, NULL},
+    {Action::ACTION_API_CALL, "tabs.reload", 0, LOOKUP_TAB_ID, NULL},
+    {Action::ACTION_API_CALL, "tabs.remove", 0, LOOKUP_TAB_ID, NULL},
+    {Action::ACTION_API_CALL, "tabs.sendMessage", 0, LOOKUP_TAB_ID, NULL},
+    {Action::ACTION_API_CALL, "tabs.update", 0, LOOKUP_TAB_ID, NULL},
+    {Action::ACTION_API_EVENT, "tabs.onUpdated", 0, LOOKUP_TAB_ID, NULL},
+    {Action::ACTION_API_EVENT, "tabs.onMoved", 0, LOOKUP_TAB_ID, NULL},
+    {Action::ACTION_API_EVENT, "tabs.onDetached", 0, LOOKUP_TAB_ID, NULL},
+    {Action::ACTION_API_EVENT, "tabs.onAttached", 0, LOOKUP_TAB_ID, NULL},
+    {Action::ACTION_API_EVENT, "tabs.onRemoved", 0, LOOKUP_TAB_ID, NULL},
+    {Action::ACTION_API_EVENT, "tabs.onReplaced", 0, LOOKUP_TAB_ID, NULL},
+
+    // Other APIs that accept URLs as strings
+    {Action::ACTION_API_CALL, "bookmarks.create", 0, DICT_LOOKUP, "url"},
+    {Action::ACTION_API_CALL, "bookmarks.update", 1, DICT_LOOKUP, "url"},
+    {Action::ACTION_API_CALL, "cookies.get", 0, DICT_LOOKUP, "url"},
+    {Action::ACTION_API_CALL, "cookies.getAll", 0, DICT_LOOKUP, "url"},
+    {Action::ACTION_API_CALL, "cookies.remove", 0, DICT_LOOKUP, "url"},
+    {Action::ACTION_API_CALL, "cookies.set", 0, DICT_LOOKUP, "url"},
+    {Action::ACTION_API_CALL, "downloads.download", 0, DICT_LOOKUP, "url"},
+    {Action::ACTION_API_CALL, "history.addUrl", 0, DICT_LOOKUP, "url"},
+    {Action::ACTION_API_CALL, "history.deleteUrl", 0, DICT_LOOKUP, "url"},
+    {Action::ACTION_API_CALL, "history.getVisits", 0, DICT_LOOKUP, "url"},
+    {Action::ACTION_API_CALL, "webstore.install", 0, NONE, NULL},
+    {Action::ACTION_API_CALL, "windows.create", 0, DICT_LOOKUP, "url"},
+    {Action::ACTION_DOM_ACCESS, "Document.location", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLButtonElement.formAction", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLEmbedElement.src", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLFormElement.action", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLFrameElement.src", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLHtmlElement.manifest", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLIFrameElement.src", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLImageElement.longDesc", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLImageElement.src", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLImageElement.lowsrc", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLInputElement.formAction", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLInputElement.src", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLLinkElement.href", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLMediaElement.src", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLMediaElement.currentSrc", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLModElement.cite", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLObjectElement.data", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLQuoteElement.cite", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLScriptElement.src", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLSourceElement.src", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLTrackElement.src", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "HTMLVideoElement.poster", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "Location.assign", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "Location.replace", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "Window.location", 0, NONE, NULL},
+    {Action::ACTION_DOM_ACCESS, "XMLHttpRequest.open", 1, NONE, NULL}};
 
 // A singleton class which provides lookups into the kApiInfoTable data
 // structure.  It inserts all data into a map on first lookup.