Cleanups to the refactored extension activity log code

chrome/browser/extensions/activity_log/activity_actions.h

Index: chrome/browser/extensions/activity_log/activity_actions.h
diff --git a/chrome/browser/extensions/activity_log/activity_actions.h b/chrome/browser/extensions/activity_log/activity_actions.h
index c867704b9f29d7d18994283f9194a01d35ef77ce..6782b8314d5738b73a7576859e82e712d6981c01 100644
--- a/chrome/browser/extensions/activity_log/activity_actions.h
+++ b/chrome/browser/extensions/activity_log/activity_actions.h
@@ -33,8 +33,7 @@ class Action : public base::RefCountedThreadSafe<Action> {
     ACTION_CONTENT_SCRIPT = 3,
     ACTION_DOM_ACCESS = 4,
     ACTION_DOM_EVENT = 5,
-    ACTION_DOM_XHR = 6,
-    ACTION_WEB_REQUEST = 7,
+    ACTION_WEB_REQUEST = 6,

[Matt Perry, 2013/08/02 19:23:04]

Should this remain as 7? (If you add another one later, it'll be 7 and you might
misinterpret old data)

[mvrable, 2013/08/02 19:57:09]

I was originally going to do that, but Adrienne pointed out that this enum was
only very recently added and the risk of confusion at this point is low.  This
keeps the code cleaner for now; we'll definitely not renumber once M30 branches.

(I think the only people who will notice this change are us and people running
canaries that also have the activity log enabled via a flag so the risk is low. 
There's not yet a user interface where you could see the bad data, and even if
it persists in the database it should at worst cause some erroneous data to be
displayed but be non-fatal.)

I could switch back if you'd prefer.

[felt, 2013/08/02 19:59:31]

I have a strong preference for keeping the code clean; we don't have any users
except for a few canary users, and since we're going to start deleting data more
than 24h old it won't even matter anyway.

On 2013/08/02 19:57:09, mvrable wrote:

[Matt Perry, 2013/08/02 20:26:05]

SGTM

On 2013/08/02 19:59:31, felt wrote:

   };
 
   // A useful shorthand for methods that take or return collections of Action