Make USB permissions work in the new permission message system

chrome/browser/extensions/permission_messages_unittest.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 "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/permissions_updater.h"
 #include "chrome/browser/extensions/test_extension_environment.h"
 #include "chrome/common/extensions/permissions/chrome_permission_message_provider.h"
@@ skipping 305 matching lines @@
         GetMessages(permission.GetPermissions());
     ASSERT_EQ(1U, messages.size());
     EXPECT_EQ(base::ASCIIToUTF16(kMessage), messages.front().message());
   }
 }
 
 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
   scoped_ptr<base::ListValue> permission_list(new base::ListValue());
   permission_list->Append(
       UsbDevicePermissionData(0x02ad, 0x138c, -1).ToValue().release());
   // This device's product ID is not in Chrome's database.
   permission_list->Append(
       UsbDevicePermissionData(0x02ad, 0x138d, -1).ToValue().release());
   // This additional unknown product will be collapsed into the entry above.
@@ skipping 15 matching lines @@
   ASSERT_EQ(1U, messages.size());
   EXPECT_EQ(base::ASCIIToUTF16(kMessage), messages.front().message());
   const std::vector<base::string16>& submessages =
       messages.front().submessages();
   ASSERT_EQ(arraysize(kDetails), submessages.size());
   for (size_t i = 0; i < submessages.size(); i++)
     EXPECT_EQ(base::ASCIIToUTF16(kDetails[i]), submessages[i]);
 }
 
 }  // namespace extensions