Extensions: Switch to new permission message system, part V

extensions/common/permissions/api_permission.h

Index: extensions/common/permissions/api_permission.h
diff --git a/extensions/common/permissions/api_permission.h b/extensions/common/permissions/api_permission.h
index 64187e8b6ad676b30aeae65bfea722a5a09f784f..819b172a519695405aeb7549909eb90da6c60eb7 100644
--- a/extensions/common/permissions/api_permission.h
+++ b/extensions/common/permissions/api_permission.h
@@ -34,16 +34,20 @@ class APIPermission {
   // The IDs of all permissions available to apps. Add as many permissions here
   // as needed to generate meaningful permission messages. Add the rules for the
   // messages to ChromePermissionMessageProvider.
-  // Remove permissions from this list if they have no longer have a
-  // corresponding API permission and no permission message.
+  // Do not reorder this enumeration or remove any entries. If you need to add a
+  // new entry, add it just prior to kEnumBoundary, and ensure to update the
+  // "ExtensionPermission3" enum in tools/metrics/histograms/histograms.xml
+  // (by running update_extension_permission.py).
   // TODO(sashab): Move this to a more central location, and rename it to
   // PermissionID.
   enum ID {
     // Error codes.
-    kInvalid = -2,
-    kUnknown = -1,
+    kInvalid,
+    kUnknown,
 
-    // Real permissions.
+    // Actual permission IDs. Not all of these are valid permissions on their
+    // own; some are just needed by various manifest permissions to represent
+    // their permission message rule combinations.
     kAccessibilityFeaturesModify,
     kAccessibilityFeaturesRead,
     kAccessibilityPrivate,
@@ -213,11 +217,6 @@ class APIPermission {
     kSystemNetwork,
     kSystemInfoCpu,
     kSystemInfoMemory,
-
-    // Permission message IDs that are not currently valid permissions on their
-    // own, but are needed by various manifest permissions to represent their
-    // permission message rule combinations.
-    // TODO(sashab): Move these in-line with the other permission IDs.
     kBluetooth,
     kBluetoothDevices,
     kFavicon,
@@ -238,7 +237,9 @@ class APIPermission {
     kUsbDeviceList,
     kUsbDeviceUnknownProduct,
     kUsbDeviceUnknownVendor,
-
+    // Last entry: Add new entries above and ensure to update the
+    // "ExtensionPermission3" enum in tools/metrics/histograms/histograms.xml
+    // (by running update_extension_permission.py).
     kEnumBoundary
   };