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,
+    // Type 6 is reserved: It was for ACTION_DOM_XHR but that was never
+    // actually used.  In the future any injected XHRs, once tracked, will be
+    // classified as ACTION_DOM_ACCESS--no separate type is needed since
+    // api_name is sufficient for distinguishing.

[felt, 2013/08/02 00:41:53]

I am fine with just making ACTION_WEB_REQUEST=6 at this point. We have no users
-- I don't think we've even caught up to this schema internally -- so we have no
real backward compatibility concerns.

[mvrable, 2013/08/02 03:33:21]

Done.

     ACTION_WEB_REQUEST = 7,
   };
 
   // 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.
@@ skipping 77 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_