Extensions: Switch to new permission message system, part I

chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc

Index: chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc
index 86a884933a0a449a12dadfcb8d7ad9532d123578..b256553b05e1fc4afbdcc3c3b3ebc6f59b4dd438 100644
--- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc
+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc
@@ -15,6 +15,7 @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/manifest.h"
+#include "extensions/common/permissions/permission_message_test_util.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "grit/extensions_strings.h"
@@ -65,7 +66,7 @@ TEST_F(AppInfoPermissionsPanelTest, NoPermissionsObtainedCorrectly) {
           .Build();
   AppInfoPermissionsPanel panel(&profile_, app.get());
 
-  EXPECT_TRUE(panel.GetActivePermissionMessages().empty());
+  EXPECT_TRUE(VerifyNoPermissionMessages(panel.app_->permissions_data()));
   EXPECT_TRUE(panel.GetRetainedFilePaths().empty());
 }
 
@@ -89,16 +90,11 @@ TEST_F(AppInfoPermissionsPanelTest, RequiredPermissionsObtainedCorrectly) {
           .Build();
   AppInfoPermissionsPanel panel(&profile_, app.get());
 
-  const std::vector<PermissionStringAndDetailsPair> permission_messages =
-      panel.GetActivePermissionMessages();
-  ASSERT_EQ(2U, permission_messages.size());
-  EXPECT_EQ(
+  EXPECT_TRUE(VerifyTwoPermissionMessages(
+      panel.app_->permissions_data(),
       l10n_util::GetStringUTF8(IDS_EXTENSION_PROMPT_WARNING_DESKTOP_CAPTURE),
-      base::UTF16ToUTF8(permission_messages[0].first));
-  EXPECT_EQ(0U, permission_messages[0].second.size());
-  EXPECT_EQ(l10n_util::GetStringUTF8(IDS_EXTENSION_PROMPT_WARNING_SERIAL),
-            base::UTF16ToUTF8(permission_messages[1].first));
-  EXPECT_EQ(0U, permission_messages[1].second.size());
+      l10n_util::GetStringUTF8(IDS_EXTENSION_PROMPT_WARNING_SERIAL),
+      false));
 }
 
 // Tests that an app's optional permissions are detected and converted to
@@ -124,7 +120,7 @@ TEST_F(AppInfoPermissionsPanelTest, OptionalPermissionsObtainedCorrectly) {
   // Optional permissions don't appear until they are 'activated' at runtime.
   // TODO(sashab): Activate the optional permissions and ensure they are
   // successfully added to the dialog.
-  EXPECT_TRUE(panel.GetActivePermissionMessages().empty());
+  EXPECT_TRUE(VerifyNoPermissionMessages(panel.app_->permissions_data()));
   EXPECT_TRUE(panel.GetRetainedFilePaths().empty());
 }
 
@@ -152,7 +148,7 @@ TEST_F(AppInfoPermissionsPanelTest, RetainedFilePermissionsObtainedCorrectly) {
   files_service->RegisterFileEntry(
       app->id(), "file_id_3", FilePath(FILE_PATH_LITERAL("file_3.ext")), false);
 
-  ASSERT_TRUE(panel.GetActivePermissionMessages().empty());
+  ASSERT_TRUE(VerifyNoPermissionMessages(panel.app_->permissions_data()));
 
   // Since we have no guarantees on the order of retained files, make sure the
   // list is the expected length and all required entries are present.