Cleanups to the refactored extension activity log code

chrome/browser/extensions/activity_log/activity_actions.h

 // Copyright (c) 2013 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_ACTIONS_H_
 #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_ACTIONS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 15 matching lines @@
  public:
   // Types of log entries that can be stored.  The numeric values are stored in
   // the database, so keep them stable.  Append values only.
   enum ActionType {
     ACTION_API_CALL = 0,
     ACTION_API_EVENT = 1,
     ACTION_API_BLOCKED = 2,
     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
   // objects.
   typedef std::vector<scoped_refptr<Action> > ActionVector;
 
   // Creates a new activity log Action object.  The extension_id, time, and
   // type are immutable.  All other fields can be filled in with the
   // accessors/mutators below.
   Action(const std::string& extension_id,
@@ skipping 76 matching lines @@
   GURL arg_url_;
   bool arg_incognito_;
   scoped_ptr<DictionaryValue> other_;
 
   DISALLOW_COPY_AND_ASSIGN(Action);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_ACTIONS_H_