Display USB devices in the site settings popup on Android.

chrome/browser/ui/website_settings/website_settings.cc

Index: chrome/browser/ui/website_settings/website_settings.cc
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index ad39bb6d1194537cca56ba2c07ff5397d1291a2a..955bd607011d5dba1ccbe141a42a7b5ae16de78b 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -201,8 +201,8 @@ ChooserContextBase* GetUsbChooserContext(Profile* profile) {
 // Settings UI. THE ORDER OF THESE ITEMS IS IMPORTANT. To propose changing it,
 // email security-dev@chromium.org.
 WebsiteSettings::ChooserUIInfo kChooserUIInfo[] = {
-    {&GetUsbChooserContext, IDR_BLOCKED_USB, IDR_ALLOWED_USB,
-     IDS_WEBSITE_SETTINGS_USB_DEVICE_LABEL,
+    {CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA, &GetUsbChooserContext,

[benwells, 2016/07/28 07:51:13]

Is there a plan to remove this USB specific code from this file? It is wrong to
have it here.

[Reilly Grant (use Gerrit), 2016/07/28 17:55:43]

Can you explain why it is wrong to have this here? There is specific code for
every permission in this file.

[benwells, 2016/07/29 05:01:39]

OK, my bad, I got a bit mixed up.

+     IDR_BLOCKED_USB, IDR_ALLOWED_USB, IDS_WEBSITE_SETTINGS_USB_DEVICE_LABEL,
      IDS_WEBSITE_SETTINGS_DELETE_USB_DEVICE, "name"},
 };