Make UI with PermissionRequestManager enabled match PermissionQueueController

chrome/browser/permissions/grouped_permission_infobar_delegate_android.h

Index: chrome/browser/permissions/grouped_permission_infobar_delegate_android.h
diff --git a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.h b/chrome/browser/permissions/grouped_permission_infobar_delegate_android.h
index 4bb31f5e4d2200224534564d5398e1b02ded0141..514843d236a96fd310d1b58977b65d7edeaef8f1 100644
--- a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.h
+++ b/chrome/browser/permissions/grouped_permission_infobar_delegate_android.h
@@ -17,7 +17,8 @@ class PermissionPromptAndroid;
 
 // An InfoBar that displays a group of permission requests, each of which can be
 // allowed or blocked independently.
-// TODO(tsergeant): Expand this class so it can be used without subclassing.
+// TODO(timloh): This is incorrectly named as we've removed grouped permissions,
+// rename it to PermissionInfoBarDelegate once crbug.com/606138 is done.
 class GroupedPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   // Public so we can have std::unique_ptr<GroupedPermissionInfoBarDelegate>.
@@ -36,10 +37,9 @@ class GroupedPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
   bool ShouldShowPersistenceToggle() const;
 
   ContentSettingsType GetContentSettingType(size_t position) const;
-  int GetIconIdForPermission(size_t position) const;
 
-  // Message text to display for an individual permission at |position|.
-  base::string16 GetMessageTextFragment(size_t position) const;
+  // InfoBarDelegate:
+  int GetIconId() const override;
 
   // ConfirmInfoBarDelegate:
   base::string16 GetMessageText() const override;