Making the extension permissions dialog scrollable, when needed (adding expandable sections for thi…

chrome/common/extensions/permissions/permissions_data_unittest.cc

Index: chrome/common/extensions/permissions/permissions_data_unittest.cc
diff --git a/chrome/common/extensions/permissions/permissions_data_unittest.cc b/chrome/common/extensions/permissions/permissions_data_unittest.cc
index 2fd87c54e62e38c58282be1134765fccf2f736c3..808e3f65f6d464b4ae4a4952fa6e93306f543ac0 100644
--- a/chrome/common/extensions/permissions/permissions_data_unittest.cc
+++ b/chrome/common/extensions/permissions/permissions_data_unittest.cc
@@ -202,7 +202,7 @@ TEST(ExtensionPermissionsTest, GetPermissionMessages_ManyAPIPermissions) {
   scoped_refptr<Extension> extension;
   extension = LoadManifest("permissions", "many-apis.json");
   std::vector<string16> warnings =
-      PermissionsData::GetPermissionMessageStrings(extension.get());
+      PermissionsData::GetPermissionMessageStrings(extension.get(), false);
   ASSERT_EQ(6u, warnings.size());
   EXPECT_EQ("Access your data on api.flickr.com",
             UTF16ToUTF8(warnings[0]));
@@ -214,6 +214,20 @@ TEST(ExtensionPermissionsTest, GetPermissionMessages_ManyAPIPermissions) {
             UTF16ToUTF8(warnings[5]));
 }
 
+TEST(ExtensionPermissionsTest, GetPermissionMessages_ManyHostsPermissions) {
+  scoped_refptr<Extension> extension;
+  extension = LoadManifest("permissions", "more-than-3-hosts.json");
+  std::vector<string16> warnings =
+      PermissionsData::GetPermissionMessageStrings(extension.get(), false);
+  std::vector<string16> warnings_details =
+      PermissionsData::GetPermissionMessageStrings(extension.get(), true);
+  ASSERT_EQ(1u, warnings.size());
+  ASSERT_EQ(1u, warnings_details.size());
+  EXPECT_EQ("Access your data on 5 websites", UTF16ToUTF8(warnings[0]));
+  EXPECT_EQ("- www.a.com\n- www.b.com\n- www.c.com\n- www.d.com\n- www.e.com",
+            UTF16ToUTF8(warnings_details[0]));
+}
+
 TEST(ExtensionPermissionsTest, GetPermissionMessages_LocationApiPermission) {
   scoped_refptr<Extension> extension;
   extension = LoadManifest("permissions",
@@ -221,7 +235,7 @@ TEST(ExtensionPermissionsTest, GetPermissionMessages_LocationApiPermission) {
                            Manifest::COMPONENT,
                            Extension::NO_FLAGS);
   std::vector<string16> warnings =
-      PermissionsData::GetPermissionMessageStrings(extension.get());
+      PermissionsData::GetPermissionMessageStrings(extension.get(), false);
   ASSERT_EQ(1u, warnings.size());
   EXPECT_EQ("Detect your physical location", UTF16ToUTF8(warnings[0]));
 }
@@ -230,7 +244,7 @@ TEST(ExtensionPermissionsTest, GetPermissionMessages_ManyHosts) {
   scoped_refptr<Extension> extension;
   extension = LoadManifest("permissions", "many-hosts.json");
   std::vector<string16> warnings =
-      PermissionsData::GetPermissionMessageStrings(extension.get());
+      PermissionsData::GetPermissionMessageStrings(extension.get(), false);
   ASSERT_EQ(1u, warnings.size());
   EXPECT_EQ("Access your data on encrypted.google.com and www.google.com",
             UTF16ToUTF8(warnings[0]));
@@ -240,7 +254,7 @@ TEST(ExtensionPermissionsTest, GetPermissionMessages_Plugins) {
   scoped_refptr<Extension> extension;
   extension = LoadManifest("permissions", "plugins.json");
   std::vector<string16> warnings =
-      PermissionsData::GetPermissionMessageStrings(extension.get());
+      PermissionsData::GetPermissionMessageStrings(extension.get(), false);
 // We don't parse the plugins key on Chrome OS, so it should not ask for any
   // permissions.
 #if defined(OS_CHROMEOS)