[Extensions] Remove withheld permissions from install prompt

We no longer need to display withheld permissions in the
extension install prompt, even with the runtime host permissions
feature enabled. Clean up the relevant code.

Bug: 841099

Change-Id: If295d36859f8664928c83923a010057f2fb4d1c1
Reviewed-on: https://chromium-review.googlesource.com/1053178Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558882}

chrome/app/generated_resources.grd

@@ -3459,9 +3459,6 @@ are declared in build/common.gypi.
       <message name="IDS_EXTENSION_PROMPT_CAN_ACCESS" desc="Second line in the content area of the extension or app permissions view dialog. Note that the exact wording is important. This should mean that the extension _can now_ access the listed privileges, because it has already been installed. This message appeared because the user must approve new permissions of the extension or app.">
         It can:
       </message>
-      <message name="IDS_EXTENSION_PROMPT_WITHHELD" desc="Header for withheld permissions warning on extension install.">
-        Warning: You've enabled the --scripts-require-action flag on this computer, which limits the capabilities of this extension. However, other devices may not support this flag or have it enabled. On these devices, this extension can also:
-      </message>
       <message name="IDS_EXTENSION_NO_SPECIAL_PERMISSIONS" desc="Shown when the app/extension requires no special permission">
         Has no special permissions.
       </message>

chrome/browser/chromeos/extensions/public_session_permission_helper.cc

@@ -150,8 +150,7 @@ bool PublicSessionPermissionHelper::HandlePermissionRequestImpl(
     messages.push_back(PermissionMessage(
         l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_CURRENT_HOST),
         extensions::PermissionIDSet()));
-    permissions_prompt->AddPermissions(
-        messages, ExtensionInstallPrompt::REGULAR_PERMISSIONS);
+    permissions_prompt->AddPermissions(messages);
   }
 
   // This Unretained is safe because the lifetime of this object is until

chrome/browser/extensions/extension_install_prompt.cc

@@ -131,13 +131,9 @@ ExtensionInstallPrompt::Prompt::~Prompt() {
 }
 
 void ExtensionInstallPrompt::Prompt::AddPermissions(
-    const PermissionMessages& permissions,
-    PermissionsType permissions_type) {
-  InstallPromptPermissions& install_permissions =
-      GetPermissionsForType(permissions_type);
-
+    const PermissionMessages& permissions) {
   for (const PermissionMessage& msg : permissions) {
-    install_permissions.permissions.push_back(msg.message());
+    prompt_permissions_.permissions.push_back(msg.message());
     // Add a dash to the front of each permission detail.
     base::string16 details;
     if (!msg.submessages().empty()) {
@@ -150,8 +146,8 @@ void ExtensionInstallPrompt::Prompt::AddPermissions(
       details = base::JoinString(detail_lines_with_bullets,
                                  base::ASCIIToUTF16("\n"));
     }
-    install_permissions.details.push_back(details);
-    install_permissions.is_showing_details.push_back(false);
+    prompt_permissions_.details.push_back(details);
+    prompt_permissions_.is_showing_details.push_back(false);
   }
 }
 
@@ -163,10 +159,6 @@ void ExtensionInstallPrompt::Prompt::SetIsShowingDetails(
     case PERMISSIONS_DETAILS:
       prompt_permissions_.is_showing_details[index] = is_showing_details;
       break;
-    case WITHHELD_PERMISSIONS_DETAILS:
-      withheld_prompt_permissions_.is_showing_details[index] =
-          is_showing_details;
-      break;
     case RETAINED_FILES_DETAILS:
       is_showing_details_for_retained_files_ = is_showing_details;
       break;
@@ -333,43 +325,31 @@ base::string16 ExtensionInstallPrompt::Prompt::GetAbortButtonLabel() const {
   return l10n_util::GetStringUTF16(id);
 }
 
-base::string16 ExtensionInstallPrompt::Prompt::GetPermissionsHeading(
-    PermissionsType permissions_type) const {
-  switch (permissions_type) {
-    case REGULAR_PERMISSIONS: {
-      int id = -1;
-      switch (type_) {
-        case INSTALL_PROMPT:
-        case INLINE_INSTALL_PROMPT:
-        case EXTERNAL_INSTALL_PROMPT:
-        case REMOTE_INSTALL_PROMPT:
-        case DELEGATED_PERMISSIONS_PROMPT:
-          id = IDS_EXTENSION_PROMPT_WILL_HAVE_ACCESS_TO;
-          break;
-        case RE_ENABLE_PROMPT:
-          id = IDS_EXTENSION_PROMPT_WILL_NOW_HAVE_ACCESS_TO;
-          break;
-        case PERMISSIONS_PROMPT:
-          id = IDS_EXTENSION_PROMPT_WANTS_ACCESS_TO;
-          break;
-        case POST_INSTALL_PERMISSIONS_PROMPT:
-        case REPAIR_PROMPT:
-          id = IDS_EXTENSION_PROMPT_CAN_ACCESS;
-          break;
-        case UNSET_PROMPT_TYPE:
-        case NUM_PROMPT_TYPES:
-          NOTREACHED();
-      }
-      return l10n_util::GetStringUTF16(id);
-    }
-    case WITHHELD_PERMISSIONS:
-      return l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WITHHELD);
-    case ALL_PERMISSIONS:
+base::string16 ExtensionInstallPrompt::Prompt::GetPermissionsHeading() const {
+  int id = -1;
+  switch (type_) {
+    case INSTALL_PROMPT:
+    case INLINE_INSTALL_PROMPT:
+    case EXTERNAL_INSTALL_PROMPT:
+    case REMOTE_INSTALL_PROMPT:
+    case DELEGATED_PERMISSIONS_PROMPT:
+      id = IDS_EXTENSION_PROMPT_WILL_HAVE_ACCESS_TO;
+      break;
+    case RE_ENABLE_PROMPT:
+      id = IDS_EXTENSION_PROMPT_WILL_NOW_HAVE_ACCESS_TO;
+      break;
+    case PERMISSIONS_PROMPT:
+      id = IDS_EXTENSION_PROMPT_WANTS_ACCESS_TO;
+      break;
+    case POST_INSTALL_PERMISSIONS_PROMPT:
+    case REPAIR_PROMPT:
+      id = IDS_EXTENSION_PROMPT_CAN_ACCESS;
+      break;
+    case UNSET_PROMPT_TYPE:
+    case NUM_PROMPT_TYPES:
       NOTREACHED();
-      return base::string16();
   }
-  NOTREACHED();
-  return base::string16();
+  return l10n_util::GetStringUTF16(id);
 }
 
 base::string16 ExtensionInstallPrompt::Prompt::GetRetainedFilesHeading() const {
@@ -384,8 +364,7 @@ base::string16 ExtensionInstallPrompt::Prompt::GetRetainedDevicesHeading()
 }
 
 bool ExtensionInstallPrompt::Prompt::ShouldShowPermissions() const {
-  return GetPermissionCount(ALL_PERMISSIONS) > 0 ||
-         type_ == POST_INSTALL_PERMISSIONS_PROMPT;
+  return GetPermissionCount() > 0 || type_ == POST_INSTALL_PERMISSIONS_PROMPT;
 }
 
 bool ExtensionInstallPrompt::Prompt::ShouldUseTabModalDialog() const {
@@ -440,54 +419,24 @@ base::string16 ExtensionInstallPrompt::Prompt::GetUserCount() const {
   return base::string16();
 }
 
-size_t ExtensionInstallPrompt::Prompt::GetPermissionCount(
-    PermissionsType permissions_type) const {
-  switch (permissions_type) {
-    case REGULAR_PERMISSIONS:
-      return prompt_permissions_.permissions.size();
-    case WITHHELD_PERMISSIONS:
-      return withheld_prompt_permissions_.permissions.size();
-    case ALL_PERMISSIONS:
-      return prompt_permissions_.permissions.size() +
-             withheld_prompt_permissions_.permissions.size();
-    default:
-      NOTREACHED();
-      return 0u;
-  }
+size_t ExtensionInstallPrompt::Prompt::GetPermissionCount() const {
+  return prompt_permissions_.permissions.size();
 }
 
-size_t ExtensionInstallPrompt::Prompt::GetPermissionsDetailsCount(
-    PermissionsType permissions_type) const {
-  switch (permissions_type) {
-    case REGULAR_PERMISSIONS:
-      return prompt_permissions_.details.size();
-    case WITHHELD_PERMISSIONS:
-      return withheld_prompt_permissions_.details.size();
-    case ALL_PERMISSIONS:
-      return prompt_permissions_.details.size() +
-             withheld_prompt_permissions_.details.size();
-    default:
-      NOTREACHED();
-      return 0u;
-  }
+size_t ExtensionInstallPrompt::Prompt::GetPermissionsDetailsCount() const {
+  return prompt_permissions_.details.size();
 }
 
 base::string16 ExtensionInstallPrompt::Prompt::GetPermission(
-    size_t index,
-    PermissionsType permissions_type) const {
-  const InstallPromptPermissions& install_permissions =
-      GetPermissionsForType(permissions_type);
-  CHECK_LT(index, install_permissions.permissions.size());
-  return install_permissions.permissions[index];
+    size_t index) const {
+  CHECK_LT(index, prompt_permissions_.permissions.size());
+  return prompt_permissions_.permissions[index];
 }
 
 base::string16 ExtensionInstallPrompt::Prompt::GetPermissionsDetails(
-    size_t index,
-    PermissionsType permissions_type) const {
-  const InstallPromptPermissions& install_permissions =
-      GetPermissionsForType(permissions_type);
-  CHECK_LT(index, install_permissions.details.size());
-  return install_permissions.details[index];
+    size_t index) const {
+  CHECK_LT(index, prompt_permissions_.details.size());
+  return prompt_permissions_.details[index];
 }
 
 bool ExtensionInstallPrompt::Prompt::GetIsShowingDetails(
@@ -496,9 +445,6 @@ bool ExtensionInstallPrompt::Prompt::GetIsShowingDetails(
     case PERMISSIONS_DETAILS:
       CHECK_LT(index, prompt_permissions_.is_showing_details.size());
       return prompt_permissions_.is_showing_details[index];
-    case WITHHELD_PERMISSIONS_DETAILS:
-      CHECK_LT(index, withheld_prompt_permissions_.is_showing_details.size());
-      return withheld_prompt_permissions_.is_showing_details[index];
     case RETAINED_FILES_DETAILS:
       return is_showing_details_for_retained_files_;
     case RETAINED_DEVICES_DETAILS:
@@ -531,22 +477,6 @@ bool ExtensionInstallPrompt::Prompt::ShouldDisplayRevokeButton() const {
   return !retained_files_.empty() || !retained_device_messages_.empty();
 }
 
-ExtensionInstallPrompt::Prompt::InstallPromptPermissions&
-ExtensionInstallPrompt::Prompt::GetPermissionsForType(
-    PermissionsType permissions_type) {
-  DCHECK_NE(ALL_PERMISSIONS, permissions_type);
-  return permissions_type == REGULAR_PERMISSIONS ? prompt_permissions_
-                                                 : withheld_prompt_permissions_;
-}
-
-const ExtensionInstallPrompt::Prompt::InstallPromptPermissions&
-ExtensionInstallPrompt::Prompt::GetPermissionsForType(
-    PermissionsType permissions_type) const {
-  DCHECK_NE(ALL_PERMISSIONS, permissions_type);
-  return permissions_type == REGULAR_PERMISSIONS ? prompt_permissions_
-                                                 : withheld_prompt_permissions_;
-}
-
 bool ExtensionInstallPrompt::Prompt::ShouldDisplayRevokeFilesButton() const {
   return !retained_files_.empty();
 }
@@ -731,7 +661,7 @@ void ExtensionInstallPrompt::ShowConfirmation() {
     permissions_to_display = custom_permissions_.get();
   } else if (extension_) {
     // Initialize permissions if they have not already been set so that
-    // withheld permissions are displayed properly in the install prompt.
+    // any transformations are correctly reflected in the install prompt.
     extensions::PermissionsUpdater(
         profile_, extensions::PermissionsUpdater::INIT_FLAG_TRANSIENT)
         .InitializePermissions(extension_);
@@ -758,19 +688,7 @@ void ExtensionInstallPrompt::ShowConfirmation() {
         extensions::PermissionMessageProvider::Get();
 
     prompt_->AddPermissions(message_provider->GetPermissionMessages(
-                                message_provider->GetAllPermissionIDs(
-                                    *permissions_to_display, type)),
-                            REGULAR_PERMISSIONS);
-
-    const PermissionSet* withheld =
-        extension_ ? &extension_->permissions_data()->withheld_permissions()
-                   : nullptr;
-    if (withheld && !withheld->IsEmpty()) {
-      prompt_->AddPermissions(
-          message_provider->GetPermissionMessages(
-              message_provider->GetAllPermissionIDs(*withheld, type)),
-          WITHHELD_PERMISSIONS);
-    }
+        message_provider->GetAllPermissionIDs(*permissions_to_display, type)));
   }
 
   prompt_->set_extension(extension_);

chrome/browser/extensions/extension_install_prompt.h

@@ -75,19 +75,10 @@ class ExtensionInstallPrompt {
   // Enumeration for permissions and retained files details.
   enum DetailsType {
     PERMISSIONS_DETAILS = 0,
-    WITHHELD_PERMISSIONS_DETAILS,
     RETAINED_FILES_DETAILS,
     RETAINED_DEVICES_DETAILS,
   };
 
-  // This enum is used to differentiate regular and withheld permissions for
-  // segregation in the install prompt.
-  enum PermissionsType {
-    REGULAR_PERMISSIONS = 0,
-    WITHHELD_PERMISSIONS,
-    ALL_PERMISSIONS,
-  };
-
   // Extra information needed to display an installation or uninstallation
   // prompt. Gets populated with raw data and exposes getters for formatted
   // strings so that the GTK/views/Cocoa install dialogs don't have to repeat
@@ -97,8 +88,7 @@ class ExtensionInstallPrompt {
     explicit Prompt(PromptType type);
     ~Prompt();
 
-    void AddPermissions(const extensions::PermissionMessages& permissions,
-                        PermissionsType permissions_type);
+    void AddPermissions(const extensions::PermissionMessages& permissions);
     void SetIsShowingDetails(DetailsType type,
                              size_t index,
                              bool is_showing_details);
@@ -115,8 +105,7 @@ class ExtensionInstallPrompt {
     // Returns the empty string when there should be no "accept" button.
     base::string16 GetAcceptButtonLabel() const;
     base::string16 GetAbortButtonLabel() const;
-    base::string16 GetPermissionsHeading(
-        PermissionsType permissions_type) const;
+    base::string16 GetPermissionsHeading() const;
     base::string16 GetRetainedFilesHeading() const;
     base::string16 GetRetainedDevicesHeading() const;
 
@@ -135,13 +124,10 @@ class ExtensionInstallPrompt {
     void AppendRatingStars(StarAppender appender, void* data) const;
     base::string16 GetRatingCount() const;
     base::string16 GetUserCount() const;
-    size_t GetPermissionCount(PermissionsType permissions_type) const;
-    size_t GetPermissionsDetailsCount(PermissionsType permissions_type) const;
-    base::string16 GetPermission(size_t index,
-                                 PermissionsType permissions_type) const;
-    base::string16 GetPermissionsDetails(
-        size_t index,
-        PermissionsType permissions_type) const;
+    size_t GetPermissionCount() const;
+    size_t GetPermissionsDetailsCount() const;
+    base::string16 GetPermission(size_t index) const;
+    base::string16 GetPermissionsDetails(size_t index) const;
     bool GetIsShowingDetails(DetailsType type, size_t index) const;
     size_t GetRetainedFileCount() const;
     base::string16 GetRetainedFile(size_t index) const;
@@ -191,13 +177,6 @@ class ExtensionInstallPrompt {
 
     bool ShouldDisplayRevokeButton() const;
 
-    // Returns the InstallPromptPermissions corresponding to
-    // |permissions_type|.
-    InstallPromptPermissions& GetPermissionsForType(
-        PermissionsType permissions_type);
-    const InstallPromptPermissions& GetPermissionsForType(
-        PermissionsType permissions_type) const;
-
     bool ShouldDisplayRevokeFilesButton() const;
 
     const PromptType type_;
@@ -205,8 +184,6 @@ class ExtensionInstallPrompt {
     // Permissions that are being requested (may not be all of an extension's
     // permissions if only additional ones are being requested)
     InstallPromptPermissions prompt_permissions_;
-    // Permissions that will be withheld upon install.
-    InstallPromptPermissions withheld_prompt_permissions_;
 
     bool is_showing_details_for_retained_files_;
     bool is_showing_details_for_retained_devices_;

chrome/browser/extensions/extension_install_prompt_unittest.cc

@@ -54,17 +54,11 @@ void VerifyPromptIconCallback(
 void VerifyPromptPermissionsCallback(
     const base::Closure& quit_closure,
     size_t regular_permissions_count,
-    size_t withheld_permissions_count,
     ExtensionInstallPromptShowParams* params,
     const ExtensionInstallPrompt::DoneCallback& done_callback,
     std::unique_ptr<ExtensionInstallPrompt::Prompt> install_prompt) {
   ASSERT_TRUE(install_prompt.get());
-  EXPECT_EQ(regular_permissions_count,
-            install_prompt->GetPermissionCount(
-                ExtensionInstallPrompt::REGULAR_PERMISSIONS));
-  EXPECT_EQ(withheld_permissions_count,
-            install_prompt->GetPermissionCount(
-                ExtensionInstallPrompt::WITHHELD_PERMISSIONS));
+  EXPECT_EQ(regular_permissions_count, install_prompt->GetPermissionCount());
   quit_closure.Run();
 }
 
@@ -124,8 +118,7 @@ TEST_F(ExtensionInstallPromptUnitTest, PromptShowsPermissionWarnings) {
           ExtensionInstallPrompt::PERMISSIONS_PROMPT),
       std::move(permission_set),
       base::Bind(&VerifyPromptPermissionsCallback, run_loop.QuitClosure(),
-                 1u,    // |regular_permissions_count|.
-                 0u));  // |withheld_permissions_count|.
+                 1u));  // |regular_permissions_count|.
   run_loop.Run();
 }
 
@@ -157,8 +150,7 @@ TEST_F(ExtensionInstallPromptUnitTest,
       ExtensionInstallPrompt::DoneCallback(), extension.get(), nullptr,
       std::move(sub_prompt),
       base::Bind(&VerifyPromptPermissionsCallback, run_loop.QuitClosure(),
-                 2u,    // |regular_permissions_count|.
-                 0u));  // |withheld_permissions_count|.
+                 2u));  // |regular_permissions_count|.
   run_loop.Run();
 }
 

chrome/browser/extensions/external_install_error.cc

@@ -243,11 +243,6 @@ base::string16 ExternalInstallBubbleAlert::GetBubbleViewTitle() {
 
 std::vector<base::string16>
 ExternalInstallBubbleAlert::GetBubbleViewMessages() {
-  ExtensionInstallPrompt::PermissionsType regular_permissions =
-      ExtensionInstallPrompt::PermissionsType::REGULAR_PERMISSIONS;
-  ExtensionInstallPrompt::PermissionsType withheld_permissions =
-      ExtensionInstallPrompt::PermissionsType::WITHHELD_PERMISSIONS;
-
   std::vector<base::string16> messages;
   int heading_id =
       IDS_EXTENSION_EXTERNAL_INSTALL_ALERT_BUBBLE_HEADING_EXTENSION;
@@ -257,22 +252,11 @@ ExternalInstallBubbleAlert::GetBubbleViewMessages() {
     heading_id = IDS_EXTENSION_EXTERNAL_INSTALL_ALERT_BUBBLE_HEADING_THEME;
   messages.push_back(l10n_util::GetStringUTF16(heading_id));
 
-  if (prompt_->GetPermissionCount(regular_permissions)) {
-    messages.push_back(prompt_->GetPermissionsHeading(regular_permissions));
-    for (size_t i = 0; i < prompt_->GetPermissionCount(regular_permissions);
-         ++i) {
-      messages.push_back(l10n_util::GetStringFUTF16(
-          IDS_EXTENSION_PERMISSION_LINE,
-          prompt_->GetPermission(i, regular_permissions)));
-    }
-  }
-  if (prompt_->GetPermissionCount(withheld_permissions)) {
-    messages.push_back(prompt_->GetPermissionsHeading(withheld_permissions));
-    for (size_t i = 0; i < prompt_->GetPermissionCount(withheld_permissions);
-         ++i) {
+  if (prompt_->GetPermissionCount()) {
+    messages.push_back(prompt_->GetPermissionsHeading());
+    for (size_t i = 0; i < prompt_->GetPermissionCount(); ++i) {
       messages.push_back(l10n_util::GetStringFUTF16(
-          IDS_EXTENSION_PERMISSION_LINE,
-          prompt_->GetPermission(i, withheld_permissions)));
+          IDS_EXTENSION_PERMISSION_LINE, prompt_->GetPermission(i)));
     }
   }
   // TODO(yoz): OAuth issue advice?

chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm

@@ -68,7 +68,6 @@ typedef NSUInteger CellAttributes;
 // returned.
 - (NSString*)
 appendPermissionsForPrompt:(const ExtensionInstallPrompt::Prompt&)prompt
-                  withType:(ExtensionInstallPrompt::PermissionsType)type
                   children:(NSMutableArray*)children;
 - (void)updateViewFrame:(NSRect)frame;
 @end
@@ -641,7 +640,6 @@ bool HasAttribute(id item, CellAttributesMask attributeMask) {
 - (NSArray*)buildWarnings:(const ExtensionInstallPrompt::Prompt&)prompt {
   NSMutableArray* warnings = [NSMutableArray array];
   NSString* heading = nil;
-  NSString* withheldHeading = nil;
 
   bool hasPermissions = prompt.GetPermissionCount(
       ExtensionInstallPrompt::PermissionsType::ALL_PERMISSIONS);
@@ -649,18 +647,10 @@ bool HasAttribute(id item, CellAttributesMask attributeMask) {
       kBoldText | kAutoExpandCell | kNoExpandMarker;
   if (prompt.ShouldShowPermissions()) {
     NSMutableArray* children = [NSMutableArray array];
-    NSMutableArray* withheldChildren = [NSMutableArray array];
 
     heading =
         [self appendPermissionsForPrompt:prompt
-                                withType:ExtensionInstallPrompt::PermissionsType
-                                             ::REGULAR_PERMISSIONS
                                 children:children];
-    withheldHeading =
-        [self appendPermissionsForPrompt:prompt
-                                withType:ExtensionInstallPrompt::PermissionsType
-                                             ::WITHHELD_PERMISSIONS
-                                children:withheldChildren];
 
     if (!hasPermissions) {
       [children addObject:
@@ -676,13 +666,6 @@ bool HasAttribute(id item, CellAttributesMask attributeMask) {
                                     cellAttributes:warningCellAttributes
                                           children:children]];
     }
-
-    // Add withheld permissions to the prompt if they exist.
-    if (withheldHeading) {
-      [warnings addObject:[self buildItemWithTitle:withheldHeading
-                                    cellAttributes:warningCellAttributes
-                                          children:withheldChildren]];
-    }
   }
 
   if (prompt.GetRetainedFileCount() > 0) {
@@ -741,28 +724,26 @@ bool HasAttribute(id item, CellAttributesMask attributeMask) {
 
 - (NSString*)
 appendPermissionsForPrompt:(const ExtensionInstallPrompt::Prompt&)prompt
-                 withType:(ExtensionInstallPrompt::PermissionsType)type
                  children:(NSMutableArray*)children {
-  size_t permissionsCount = prompt.GetPermissionCount(type);
+  size_t permissionsCount = prompt.GetPermissionCount();
   if (permissionsCount == 0)
     return NULL;
 
   for (size_t i = 0; i < permissionsCount; ++i) {
-    NSDictionary* item = [self
-        buildItemWithTitle:SysUTF16ToNSString(prompt.GetPermission(i, type))
-            cellAttributes:kUseBullet
-                  children:nil];
+    NSDictionary* item =
+        [self buildItemWithTitle:SysUTF16ToNSString(prompt.GetPermission(i))
+                  cellAttributes:kUseBullet
+                        children:nil];
     [children addObject:item];
 
     // If there are additional details, add them below this item.
-    if (!prompt.GetPermissionsDetails(i, type).empty()) {
+    if (!prompt.GetPermissionsDetails(i).empty()) {
       if (prompt.GetIsShowingDetails(
               ExtensionInstallPrompt::PERMISSIONS_DETAILS, i)) {
-        item =
-            [self buildItemWithTitle:SysUTF16ToNSString(
-                                         prompt.GetPermissionsDetails(i, type))
-                      cellAttributes:kNoExpandMarker
-                            children:nil];
+        item = [self buildItemWithTitle:SysUTF16ToNSString(
+                                            prompt.GetPermissionsDetails(i))
+                         cellAttributes:kNoExpandMarker
+                               children:nil];
         [children addObject:item];
       }
 
@@ -772,7 +753,7 @@ appendPermissionsForPrompt:(const ExtensionInstallPrompt::Prompt&)prompt
     }
   }
 
-  return SysUTF16ToNSString(prompt.GetPermissionsHeading(type));
+  return SysUTF16ToNSString(prompt.GetPermissionsHeading());
 }
 
 - (void)updateViewFrame:(NSRect)frame {

chrome/browser/ui/views/extensions/extension_install_dialog_view.cc

@@ -215,20 +215,18 @@ struct ExtensionInfoSection {
 // Adds a section to |sections| for permissions of |perm_type| if there are any.
 void AddPermissions(ExtensionInstallPrompt::Prompt* prompt,
                     std::vector<ExtensionInfoSection>& sections,
-                    int available_width,
-                    ExtensionInstallPrompt::PermissionsType perm_type) {
-  if (prompt->GetPermissionCount(perm_type) == 0)
-    return;
+                    int available_width) {
+  DCHECK_GT(prompt->GetPermissionCount(), 0u);
 
   auto permissions_view = std::make_unique<PermissionsView>(available_width);
 
-  for (size_t i = 0; i < prompt->GetPermissionCount(perm_type); ++i) {
-    permissions_view->AddItem(prompt->GetPermission(i, perm_type),
-                              prompt->GetPermissionsDetails(i, perm_type));
+  for (size_t i = 0; i < prompt->GetPermissionCount(); ++i) {
+    permissions_view->AddItem(prompt->GetPermission(i),
+                              prompt->GetPermissionsDetails(i));
   }
 
   sections.push_back(
-      {prompt->GetPermissionsHeading(perm_type), std::move(permissions_view)});
+      {prompt->GetPermissionsHeading(), std::move(permissions_view)});
 }
 
 }  // namespace
@@ -276,16 +274,9 @@ void ExtensionInstallDialogView::CreateContents() {
 
   std::vector<ExtensionInfoSection> sections;
   if (prompt_->ShouldShowPermissions()) {
-    bool has_permissions =
-        prompt_->GetPermissionCount(
-            ExtensionInstallPrompt::PermissionsType::ALL_PERMISSIONS) > 0;
+    bool has_permissions = prompt_->GetPermissionCount() > 0;
     if (has_permissions) {
-      AddPermissions(
-          prompt_.get(), sections, content_width,
-          ExtensionInstallPrompt::PermissionsType::REGULAR_PERMISSIONS);
-      AddPermissions(
-          prompt_.get(), sections, content_width,
-          ExtensionInstallPrompt::PermissionsType::WITHHELD_PERMISSIONS);
+      AddPermissions(prompt_.get(), sections, content_width);
     } else {
       sections.push_back(
           {l10n_util::GetStringUTF16(IDS_EXTENSION_NO_SPECIAL_PERMISSIONS),

chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc

@@ -129,8 +129,7 @@ IN_PROC_BROWSER_TEST_F(ScrollbarTest, LongPromptScrollbar) {
   }
   std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt =
       CreatePrompt(ExtensionInstallPrompt::PERMISSIONS_PROMPT);
-  prompt->AddPermissions(permissions,
-                         ExtensionInstallPrompt::REGULAR_PERMISSIONS);
+  prompt->AddPermissions(permissions);
   ASSERT_TRUE(IsScrollbarVisible(std::move(prompt)))
       << "Scrollbar is not visible";
 }
@@ -145,8 +144,7 @@ IN_PROC_BROWSER_TEST_F(ScrollbarTest, ScrollbarRegression) {
                                           PermissionIDSet()));
   std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt =
       CreatePrompt(ExtensionInstallPrompt::PERMISSIONS_PROMPT);
-  prompt->AddPermissions(permissions,
-                         ExtensionInstallPrompt::REGULAR_PERMISSIONS);
+  prompt->AddPermissions(permissions);
   ASSERT_FALSE(IsScrollbarVisible(std::move(prompt))) << "Scrollbar is visible";
 }
 
@@ -247,10 +245,7 @@ class ExtensionInstallDialogViewInteractiveBrowserTest
     icon.eraseARGB(255, 128, 255, 128);
 
     auto prompt = std::make_unique<ExtensionInstallPrompt::Prompt>(type_);
-    prompt->AddPermissions(permissions_,
-                           ExtensionInstallPrompt::REGULAR_PERMISSIONS);
-    prompt->AddPermissions(withheld_permissions_,
-                           ExtensionInstallPrompt::WITHHELD_PERMISSIONS);
+    prompt->AddPermissions(permissions_);
     prompt->set_retained_files(retained_files_);
     prompt->set_retained_device_messages(retained_devices_);
 
@@ -274,11 +269,6 @@ class ExtensionInstallDialogViewInteractiveBrowserTest
         PermissionMessage(base::ASCIIToUTF16(permission), PermissionIDSet()));
   }
 
-  void AddWithheldPermission(std::string permission) {
-    withheld_permissions_.push_back(
-        PermissionMessage(base::ASCIIToUTF16(permission), PermissionIDSet()));
-  }
-
   void AddRetainedFile(const base::FilePath& path) {
     retained_files_.push_back(path);
   }
@@ -300,7 +290,6 @@ class ExtensionInstallDialogViewInteractiveBrowserTest
       ExtensionInstallPrompt::INLINE_INSTALL_PROMPT;
   bool from_webstore_ = false;
   PermissionMessages permissions_;
-  PermissionMessages withheld_permissions_;
   std::vector<base::FilePath> retained_files_;
   std::vector<base::string16> retained_devices_;
 
@@ -372,12 +361,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogViewInteractiveBrowserTest,
   ShowAndVerifyUi();
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogViewInteractiveBrowserTest,
-                       InvokeUi_WithheldPermission) {
-  AddWithheldPermission("Example permission");
-  ShowAndVerifyUi();
-}
-
 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogViewInteractiveBrowserTest,
                        InvokeUi_WithRetainedFiles) {
   AddRetainedFile(base::FilePath(FILE_PATH_LITERAL("/dev/null")));