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

chrome/common/extensions/permissions/permission_set_unittest.cc

Index: chrome/common/extensions/permissions/permission_set_unittest.cc
diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/chrome/common/extensions/permissions/permission_set_unittest.cc
index 28f24279cb3ee479f620c30a61404b1fd2f184c3..32914ab52d8d15cd4fc7220626a3821ff6dc9a0f 100644
--- a/chrome/common/extensions/permissions/permission_set_unittest.cc
+++ b/chrome/common/extensions/permissions/permission_set_unittest.cc
@@ -826,7 +826,7 @@ TEST(PermissionsTest, GetWarningMessages_ManyHosts) {
 
   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]));
@@ -838,7 +838,7 @@ TEST(PermissionsTest, GetWarningMessages_Plugins) {
 
   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)
@@ -858,7 +858,7 @@ TEST(PermissionsTest, GetWarningMessages_AudioVideo) {
       const_cast<PermissionSet*>(
           extension->GetActivePermissions().get());
   std::vector<string16> warnings =
-      set->GetWarningMessages(extension->GetType());
+      set->GetWarningMessages(extension->GetType(), false);
   EXPECT_FALSE(Contains(warnings, "Use your microphone"));
   EXPECT_FALSE(Contains(warnings, "Use your camera"));
   EXPECT_TRUE(Contains(warnings, "Use your microphone and camera"));
@@ -867,7 +867,7 @@ TEST(PermissionsTest, GetWarningMessages_AudioVideo) {
 
   // Just audio present.
   set->apis_.erase(APIPermission::kVideoCapture);
-  warnings = set->GetWarningMessages(extension->GetType());
+  warnings = set->GetWarningMessages(extension->GetType(), false);
   EXPECT_EQ(combined_size, warnings.size());
   EXPECT_EQ(combined_index, IndexOf(warnings, "Use your microphone"));
   EXPECT_FALSE(Contains(warnings, "Use your camera"));
@@ -876,7 +876,7 @@ TEST(PermissionsTest, GetWarningMessages_AudioVideo) {
   // Just video present.
   set->apis_.erase(APIPermission::kAudioCapture);
   set->apis_.insert(APIPermission::kVideoCapture);
-  warnings = set->GetWarningMessages(extension->GetType());
+  warnings = set->GetWarningMessages(extension->GetType(), false);
   EXPECT_EQ(combined_size, warnings.size());
   EXPECT_FALSE(Contains(warnings, "Use your microphone"));
   EXPECT_FALSE(Contains(warnings, "Use your microphone and camera"));
@@ -890,7 +890,7 @@ TEST(PermissionsTest, GetWarningMessages_Serial) {
   EXPECT_TRUE(extension->is_platform_app());
   EXPECT_TRUE(extension->HasAPIPermission(APIPermission::kSerial));
   std::vector<string16> warnings =
-      PermissionsData::GetPermissionMessageStrings(extension.get());
+      PermissionsData::GetPermissionMessageStrings(extension.get(), false);
   EXPECT_TRUE(
       Contains(warnings, "Use serial devices attached to your computer"));
   ASSERT_EQ(1u, warnings.size());
@@ -904,7 +904,7 @@ TEST(PermissionsTest, GetWarningMessages_Socket_AnyHost) {
   EXPECT_TRUE(extension->is_platform_app());
   EXPECT_TRUE(extension->HasAPIPermission(APIPermission::kSocket));
   std::vector<string16> warnings =
-      PermissionsData::GetPermissionMessageStrings(extension.get());
+      PermissionsData::GetPermissionMessageStrings(extension.get(), false);
   EXPECT_EQ(1u, warnings.size());
   EXPECT_TRUE(Contains(warnings, "Exchange data with any computer "
                                  "on the local network or internet"));
@@ -918,7 +918,7 @@ TEST(PermissionsTest, GetWarningMessages_Socket_OneDomainTwoHostnames) {
   EXPECT_TRUE(extension->is_platform_app());
   EXPECT_TRUE(extension->HasAPIPermission(APIPermission::kSocket));
   std::vector<string16> warnings =
-      PermissionsData::GetPermissionMessageStrings(extension.get());
+      PermissionsData::GetPermissionMessageStrings(extension.get(), false);
 
   // Verify the warnings, including support for unicode characters, the fact
   // that domain host warnings come before specific host warnings, and the fact
@@ -944,7 +944,7 @@ TEST(PermissionsTest, GetWarningMessages_Socket_TwoDomainsOneHostname) {
   EXPECT_TRUE(extension->is_platform_app());
   EXPECT_TRUE(extension->HasAPIPermission(APIPermission::kSocket));
   std::vector<string16> warnings =
-      PermissionsData::GetPermissionMessageStrings(extension.get());
+      PermissionsData::GetPermissionMessageStrings(extension.get(), false);
 
   // Verify the warnings, including the fact that domain host warnings come
   // before specific host warnings and the fact that domains and hostnames are
@@ -966,12 +966,13 @@ TEST(PermissionsTest, GetWarningMessages_PlatformApppHosts) {
   extension = LoadManifest("permissions", "platform_app_hosts.json");
   EXPECT_TRUE(extension->is_platform_app());
   std::vector<string16> warnings =
-      PermissionsData::GetPermissionMessageStrings(extension.get());
+      PermissionsData::GetPermissionMessageStrings(extension.get(), false);
   ASSERT_EQ(0u, warnings.size());
 
   extension = LoadManifest("permissions", "platform_app_all_urls.json");
   EXPECT_TRUE(extension->is_platform_app());
-  warnings = PermissionsData::GetPermissionMessageStrings(extension.get());
+  warnings = PermissionsData::GetPermissionMessageStrings(
+      extension.get(), false);
   ASSERT_EQ(0u, warnings.size());
 }
 
@@ -1372,7 +1373,7 @@ TEST(PermissionsTest, SyncFileSystemPermission) {
   EXPECT_TRUE(extension->is_platform_app());
   EXPECT_TRUE(extension->HasAPIPermission(APIPermission::kSyncFileSystem));
   std::vector<string16> warnings =
-      PermissionsData::GetPermissionMessageStrings(extension.get());
+      PermissionsData::GetPermissionMessageStrings(extension.get(), false);
   EXPECT_TRUE(Contains(warnings, "Store data in your Google Drive account"));
   ASSERT_EQ(1u, warnings.size());
 }
@@ -1391,7 +1392,7 @@ TEST(PermissionsTest, ChromeURLs) {
       URLPattern(URLPattern::SCHEME_ALL, "chrome://thumb/"));
   scoped_refptr<PermissionSet> permissions(
       new PermissionSet(APIPermissionSet(), allowed_hosts, URLPatternSet()));
-  permissions->GetPermissionMessages(Manifest::TYPE_EXTENSION);
+  permissions->GetPermissionMessages(Manifest::TYPE_EXTENSION, false);
 }
 
 }  // namespace extensions