Move usbDevices permission out to //extensions.

Let the base ExtensionAPIPermissions set provide
the usbDevices permission, rather than restricting
it to Chrome only.

BUG=385738
R=yoz@chromium.org

Review URL: https://codereview.chromium.org/339953002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277927 0039d316-1c4b-4281-b951-d872f2087c98

chrome/common/extensions/permissions/chrome_api_permissions.cc

@@ -9,7 +9,6 @@
 #include "extensions/common/permissions/media_galleries_permission.h"
 #include "extensions/common/permissions/permission_message.h"
 #include "extensions/common/permissions/permissions_info.h"
-#include "extensions/common/permissions/usb_device_permission.h"
 #include "grit/extensions_strings.h"
 #include "grit/generated_resources.h"
 
@@ -321,8 +320,6 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions()
        &CreateAPIPermission<MediaGalleriesPermission>},
       {APIPermission::kPushMessaging, "pushMessaging",
        APIPermissionInfo::kFlagCannotBeOptional},
-      {APIPermission::kUsbDevice, "usbDevices", APIPermissionInfo::kFlagNone, 0,
-       PermissionMessage::kNone, &CreateAPIPermission<UsbDevicePermission>},
       {APIPermission::kSystemCpu, "system.cpu"},
       {APIPermission::kSystemMemory, "system.memory"},
       {APIPermission::kSystemNetwork, "system.network"},

extensions/common/permissions/extensions_api_permissions.cc

@@ -7,6 +7,7 @@
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/permission_message.h"
 #include "extensions/common/permissions/socket_permission.h"
+#include "extensions/common/permissions/usb_device_permission.h"
 #include "grit/extensions_strings.h"
 
 namespace extensions {
@@ -34,6 +35,8 @@ std::vector<APIPermissionInfo*> ExtensionsAPIPermissions::GetAllPermissions()
       {APIPermission::kStorage, "storage"},
       {APIPermission::kUsb, "usb", APIPermissionInfo::kFlagNone,
        IDS_EXTENSION_PROMPT_WARNING_USB, PermissionMessage::kUsb},
+      {APIPermission::kUsbDevice, "usbDevices", APIPermissionInfo::kFlagNone, 0,
+       PermissionMessage::kNone, &CreateAPIPermission<UsbDevicePermission>},
   };
 
   std::vector<APIPermissionInfo*> permissions;