Reorder permission message rules, so that related rules appear together

chrome/common/extensions/permissions/chrome_permission_message_provider_unittest.cc

Index: chrome/common/extensions/permissions/chrome_permission_message_provider_unittest.cc
diff --git a/chrome/common/extensions/permissions/chrome_permission_message_provider_unittest.cc b/chrome/common/extensions/permissions/chrome_permission_message_provider_unittest.cc
index b62342c51ca5c6c2664c89091ff2ee8dc393fd9e..35113e349ecc47358b75a78d90915d8802778b62 100644
--- a/chrome/common/extensions/permissions/chrome_permission_message_provider_unittest.cc
+++ b/chrome/common/extensions/permissions/chrome_permission_message_provider_unittest.cc
@@ -108,14 +108,14 @@ TEST_F(ChromePermissionMessageProviderUnittest,
   auto it = messages.begin();
   const PermissionMessage& message0 = *it++;
   EXPECT_EQ(
-      l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST),

[Marc Treib, 2015/09/01 13:16:07]

Here, the order of the two messages changed. We don't really care either way (if
anything, the new order is probably better). In an ideal world, the test would
reflect that and ignore the order, but building an order-independent comparison
here seems like more trouble than it's worth.

+      l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ),
       message0.message());
-  EXPECT_FALSE(message0.submessages().empty());
+  EXPECT_TRUE(message0.submessages().empty());
   const PermissionMessage& message1 = *it++;
   EXPECT_EQ(
-      l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ),
+      l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST),
       message1.message());
-  EXPECT_TRUE(message1.submessages().empty());
+  EXPECT_FALSE(message1.submessages().empty());
 }
 
 }  // namespace extensions