Reorder permission message rules, so that related rules appear together

chrome/common/extensions/permissions/chrome_permission_message_provider_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 "chrome/common/extensions/permissions/chrome_permission_message_provider.h"
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
@@ skipping 90 matching lines @@
   ASSERT_TRUE(usb->FromValue(devices_list.get(), nullptr, nullptr));
   permissions.insert(usb.release());
 
   PermissionMessages messages =
       GetMessages(permissions, Manifest::TYPE_EXTENSION);
 
   ASSERT_EQ(2U, messages.size());
   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