Added PermissionIDSet to APIPermissions

extensions/common/permissions/usb_device_permission.cc

 // Copyright 2014 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.
 
 #include "extensions/common/permissions/usb_device_permission.h"
 
 #include <set>
 #include <string>
 
 #include "base/logging.h"
@@ skipping 10 matching lines @@
 
 UsbDevicePermission::UsbDevicePermission(
     const APIPermissionInfo* info)
   : SetDisjunctionPermission<UsbDevicePermissionData,
                              UsbDevicePermission>(info) {
 }
 
 UsbDevicePermission::~UsbDevicePermission() {
 }
 
+PermissionIDSet UsbDevicePermission::GetPermissions() const {
+  PermissionMessages messages;
+  PermissionIDSet ids;
+  AddPermissionsToLists(ids, messages);
+  return ids;
+}
+
 PermissionMessages UsbDevicePermission::GetMessages() const {
   DCHECK(HasMessages());
-  PermissionMessages result;
+  PermissionMessages messages;
+  PermissionIDSet ids;
+  AddPermissionsToLists(ids, messages);
+  return messages;
+}
 
+void UsbDevicePermission::AddPermissionsToLists(
+    PermissionIDSet& ids,
+    PermissionMessages& messages) const {
+  // TODO(sashab, reillyg): Once the |messages| argument is removed, rework
+  // the permission message logic for USB devices to generate more meaningful
+  // messages and better fit the current rules system.
   if (data_set_.size() == 1) {
     const UsbDevicePermissionData& data = *data_set_.begin();
 
     const char* vendor = device::UsbIds::GetVendorName(data.vendor_id());
     if (vendor) {
       const char* product =
           device::UsbIds::GetProductName(data.vendor_id(), data.product_id());
       if (product) {
-        result.push_back(PermissionMessage(
+        base::string16 product_name_and_vendor = l10n_util::GetStringFUTF16(
+            IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_PRODUCT_NAME_AND_VENDOR,
+            base::UTF8ToUTF16(product), base::UTF8ToUTF16(vendor));
+
+        messages.push_back(PermissionMessage(
             PermissionMessage::kUsbDevice,
             l10n_util::GetStringFUTF16(IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE,
-                                       base::UTF8ToUTF16(product),
-                                       base::UTF8ToUTF16(vendor))));
+                                       product_name_and_vendor)));
+        ids.insert(APIPermission::kUsbDevice, product_name_and_vendor);
       } else {
-        result.push_back(PermissionMessage(
+        messages.push_back(PermissionMessage(
             PermissionMessage::kUsbDevice,
             l10n_util::GetStringFUTF16(
                 IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_UNKNOWN_PRODUCT,
                 base::UTF8ToUTF16(vendor))));
+        ids.insert(APIPermission::kUsbDeviceUnknownProduct,
+                   base::UTF8ToUTF16(vendor));
       }
     } else {
-      result.push_back(PermissionMessage(
+      messages.push_back(PermissionMessage(
           PermissionMessage::kUsbDevice,
           l10n_util::GetStringUTF16(
               IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_UNKNOWN_VENDOR)));
+      ids.insert(APIPermission::kUsbDeviceUnknownVendor);
     }
   } else if (data_set_.size() > 1) {
     std::vector<base::string16> details;
     std::set<uint16> unknown_product_vendors;
     bool found_unknown_vendor = false;
 
     for (const UsbDevicePermissionData& data : data_set_) {
       const char* vendor = device::UsbIds::GetVendorName(data.vendor_id());
       if (vendor) {
         const char* product =
@@ skipping 18 matching lines @@
           IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST_ITEM_UNKNOWN_PRODUCT,
           base::UTF8ToUTF16(vendor)));
     }
 
     // Display the catch all "device from an unknown vendor" last.
     if (found_unknown_vendor) {
       details.push_back(l10n_util::GetStringUTF16(
           IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST_ITEM_UNKNOWN_VENDOR));
     }
 
-    result.push_back(PermissionMessage(
+    messages.push_back(PermissionMessage(
         PermissionMessage::kUsbDevice,
         l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST),
         JoinString(details, base::char16('\n'))));
+    for (const auto& detail : details)
+      ids.insert(APIPermission::kUsbDeviceList, detail);
   }
-
-  return result;
 }
 
 }  // namespace extensions