Make USB permissions work in the new permission message system

chrome/browser/extensions/permission_messages_unittest.cc

Index: chrome/browser/extensions/permission_messages_unittest.cc
diff --git a/chrome/browser/extensions/permission_messages_unittest.cc b/chrome/browser/extensions/permission_messages_unittest.cc
index 4a0aeec6a65c6923224b927e6d05c944e7dcf317..df377cdf6ab36b4e3d65b7d80034037953f0395d 100644
--- a/chrome/browser/extensions/permission_messages_unittest.cc
+++ b/chrome/browser/extensions/permission_messages_unittest.cc
@@ -323,11 +323,8 @@ TEST_F(USBDevicePermissionMessagesTest, MultipleDevice) {
   const char kMessage[] = "Access any of these USB devices";
   const char* kDetails[] = {
       "PVR Mass Storage from HUMAX Co., Ltd.",
-      // TODO(treib): The following two should be the other way around -
-      // "unknown devices from Vendor" first, then the catch-all "devices from
-      // unknown vendor". crbug.com/522842
-      "devices from an unknown vendor",
-      "unknown devices from HUMAX Co., Ltd."
+      "unknown devices from HUMAX Co., Ltd.",
+      "devices from an unknown vendor"
   };
 
   // Prepare data set