[Extensions Cleanup] Slightly polish permission_message_test_util.*

Remove unused methods and inline others in
permission_message_test_util.*. This is a first step; I expect there
may be more - which may be better surfaced through codesearch
after a day to update cross-references.

Bug: None
Change-Id: I08db855f9ae98874bd7c1e6d0ae34341a7ac3475
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2141835Reviewed-by: David Bertoni <dbertoni@chromium.org>
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757674}

extensions/common/permissions/permission_message_test_util.cc

@@ -9,6 +9,7 @@
 #include <algorithm>
 #include <iterator>
 
+#include "base/strings/strcat.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -26,23 +27,6 @@ PermissionMessages GetMessages(const PermissionSet& permissions,
       provider->GetAllPermissionIDs(permissions, extension_type));
 }
 
-std::vector<base::string16> MakeVectorString16(const base::string16& str) {
-  return std::vector<base::string16>(1, str);
-}
-
-std::vector<base::string16> MakeVectorString16(const base::string16& str1,
-                                               const base::string16& str2) {
-  std::vector<base::string16> result;
-  result.push_back(str1);
-  result.push_back(str2);
-  return result;
-}
-
-std::vector<base::string16> MakeVectorString16(const std::string& str1,
-                                               const std::string& str2) {
-  return MakeVectorString16(base::UTF8ToUTF16(str1), base::UTF8ToUTF16(str2));
-}
-
 std::vector<base::string16> MakeVectorString16(
     const std::vector<std::string>& vec) {
   std::vector<base::string16> result;
@@ -51,11 +35,6 @@ std::vector<base::string16> MakeVectorString16(
   return result;
 }
 
-std::vector<std::vector<base::string16>> MakeVectorVectorString16(
-    const std::vector<base::string16>& vec) {
-  return std::vector<std::vector<base::string16>>(1, vec);
-}
-
 std::vector<std::vector<base::string16>> MakeVectorVectorString16(
     const std::vector<std::vector<std::string>>& vecs) {
   std::vector<std::vector<base::string16>> result;
@@ -66,16 +45,17 @@ std::vector<std::vector<base::string16>> MakeVectorVectorString16(
 
 // Returns the vector of messages concatenated into a single string, separated
 // by newlines, e.g.: "Bar"\n"Baz"\n
-base::string16 MessagesVectorToString(
+std::string MessagesVectorToString(
     const std::vector<base::string16>& messages) {
   if (messages.empty())
-    return base::ASCIIToUTF16("\n");
-  return base::ASCIIToUTF16("\"") +
-         base::JoinString(messages, base::ASCIIToUTF16("\"\n\"")) +
-         base::ASCIIToUTF16("\"\n");
+    return "\n";
+  return base::StrCat({"\"",
+                       base::UTF16ToUTF8(base::JoinString(
+                           messages, base::ASCIIToUTF16("\"\n\""))),
+                       "\"\n"});
 }
 
-base::string16 MessagesToString(const PermissionMessages& messages) {
+std::string MessagesToString(const PermissionMessages& messages) {
   std::vector<base::string16> messages_vec;
   for (const PermissionMessage& msg : messages)
     messages_vec.push_back(msg.message());
@@ -180,35 +160,19 @@ testing::AssertionResult VerifyPermissionMessagesWithSubmessagesImpl(
 
 }  // namespace
 
-testing::AssertionResult VerifyHasPermissionMessage(
-    const PermissionsData* permissions_data,
-    const std::string& expected_message) {
-  return VerifyHasPermissionMessage(permissions_data,
-                                    base::UTF8ToUTF16(expected_message));
-}
-
 testing::AssertionResult VerifyHasPermissionMessage(
     const PermissionsData* permissions_data,
     const base::string16& expected_message) {
   return VerifyHasPermissionMessageImpl(
-      expected_message, std::vector<base::string16>(),
-      permissions_data->GetPermissionMessages());
+      expected_message, {}, permissions_data->GetPermissionMessages());
 }
 
 testing::AssertionResult VerifyHasPermissionMessage(
     const PermissionSet& permissions,
     Manifest::Type extension_type,
     const std::string& expected_message) {
-  return VerifyHasPermissionMessage(permissions, extension_type,
-                                    base::UTF8ToUTF16(expected_message));
-}
-
-testing::AssertionResult VerifyHasPermissionMessage(
-    const PermissionSet& permissions,
-    Manifest::Type extension_type,
-    const base::string16& expected_message) {
   return VerifyHasPermissionMessageImpl(
-      expected_message, std::vector<base::string16>(),
+      base::UTF8ToUTF16(expected_message), {},
       GetMessages(permissions, extension_type));
 }
 
@@ -228,8 +192,7 @@ testing::AssertionResult VerifyOnePermissionMessage(
 testing::AssertionResult VerifyOnePermissionMessage(
     const PermissionsData* permissions_data,
     const base::string16& expected_message) {
-  return VerifyPermissionMessages(permissions_data,
-                                  MakeVectorString16(expected_message), true);
+  return VerifyPermissionMessages(permissions_data, {expected_message}, true);
 }
 
 testing::AssertionResult VerifyOnePermissionMessage(
@@ -237,8 +200,7 @@ testing::AssertionResult VerifyOnePermissionMessage(
     Manifest::Type extension_type,
     const base::string16& expected_message) {
   return VerifyPermissionMessagesWithSubmessagesImpl(
-      MakeVectorString16(expected_message),
-      std::vector<std::vector<base::string16>>(1),
+      {expected_message}, std::vector<std::vector<base::string16>>(1),
       GetMessages(permissions, extension_type), true);
 }
 
@@ -246,18 +208,8 @@ testing::AssertionResult VerifyOnePermissionMessageWithSubmessages(
     const PermissionsData* permissions_data,
     const std::string& expected_message,
     const std::vector<std::string>& expected_submessages) {
-  return VerifyOnePermissionMessageWithSubmessages(
-      permissions_data, base::UTF8ToUTF16(expected_message),
-      MakeVectorString16(expected_submessages));
-}
-
-testing::AssertionResult VerifyOnePermissionMessageWithSubmessages(
-    const PermissionsData* permissions_data,
-    const base::string16& expected_message,
-    const std::vector<base::string16>& expected_submessages) {
   return VerifyPermissionMessagesWithSubmessages(
-      permissions_data, MakeVectorString16(expected_message),
-      MakeVectorVectorString16(expected_submessages), true);
+      permissions_data, {expected_message}, {expected_submessages}, true);
 }
 
 testing::AssertionResult VerifyTwoPermissionMessages(
@@ -265,19 +217,10 @@ testing::AssertionResult VerifyTwoPermissionMessages(
     const std::string& expected_message_1,
     const std::string& expected_message_2,
     bool check_order) {
-  return VerifyPermissionMessages(
-      permissions_data,
-      MakeVectorString16(expected_message_1, expected_message_2), check_order);
-}
-
-testing::AssertionResult VerifyTwoPermissionMessages(
-    const PermissionsData* permissions_data,
-    const base::string16& expected_message_1,
-    const base::string16& expected_message_2,
-    bool check_order) {
-  return VerifyPermissionMessages(
-      permissions_data,
-      MakeVectorString16(expected_message_1, expected_message_2), check_order);
+  return VerifyPermissionMessages(permissions_data,
+                                  {base::UTF8ToUTF16(expected_message_1),
+                                   base::UTF8ToUTF16(expected_message_2)},
+                                  check_order);
 }
 
 testing::AssertionResult VerifyPermissionMessages(

extensions/common/permissions/permission_message_test_util.h

@@ -17,9 +17,6 @@ namespace extensions {
 class PermissionsData;
 class PermissionSet;
 
-testing::AssertionResult VerifyHasPermissionMessage(
-    const PermissionsData* permissions_data,
-    const std::string& expected_message);
 testing::AssertionResult VerifyHasPermissionMessage(
     const PermissionsData* permissions_data,
     const base::string16& expected_message);
@@ -27,10 +24,6 @@ testing::AssertionResult VerifyHasPermissionMessage(
     const PermissionSet& permissions,
     Manifest::Type extension_type,
     const std::string& expected_message);
-testing::AssertionResult VerifyHasPermissionMessage(
-    const PermissionSet& permissions,
-    Manifest::Type extension_type,
-    const base::string16& expected_message);
 
 testing::AssertionResult VerifyNoPermissionMessages(
     const PermissionsData* permissions_data);
@@ -50,21 +43,12 @@ testing::AssertionResult VerifyOnePermissionMessageWithSubmessages(
     const PermissionsData* permissions_data,
     const std::string& expected_message,
     const std::vector<std::string>& expected_submessages);
-testing::AssertionResult VerifyOnePermissionMessageWithSubmessages(
-    const PermissionsData* permissions_data,
-    const base::string16& expected_message,
-    const std::vector<base::string16>& expected_submessages);
 
 testing::AssertionResult VerifyTwoPermissionMessages(
     const PermissionsData* permissions_data,
     const std::string& expected_message_1,
     const std::string& expected_message_2,
     bool check_order);
-testing::AssertionResult VerifyTwoPermissionMessages(
-    const PermissionsData* permissions_data,
-    const base::string16& expected_message_1,
-    const base::string16& expected_message_2,
-    bool check_order);
 
 testing::AssertionResult VerifyPermissionMessages(
     const PermissionsData* permissions_data,