Make UI with PermissionRequestManager enabled match PermissionQueueController

chrome/browser/permissions/permission_prompt_android.h

Index: chrome/browser/permissions/permission_prompt_android.h
diff --git a/chrome/browser/permissions/permission_prompt_android.h b/chrome/browser/permissions/permission_prompt_android.h
index 7a92397756e5c92c933ee20144a1d94e75f8ac3f..7e164f88c37f637502ed30e825b43e5d01fe4662 100644
--- a/chrome/browser/permissions/permission_prompt_android.h
+++ b/chrome/browser/permissions/permission_prompt_android.h
@@ -35,12 +35,13 @@ class PermissionPromptAndroid : public PermissionPrompt {
   void Accept();
   void Deny();
 
+  // We show one permission at a time except for grouped mic+camera, for which
+  // we still have a single icon and message text.
   size_t PermissionCount() const;
   bool ShouldShowPersistenceToggle() const;
   ContentSettingsType GetContentSettingType(size_t position) const;
-  int GetIconIdForPermission(size_t position) const;
-  base::string16 GetMessageText(size_t position) const;
-  base::string16 GetMessageTextFragment(size_t position) const;
+  int GetIconId() const;
+  base::string16 GetMessageText() const;
 
   base::string16 GetLinkText() const;
   GURL GetLinkURL() const;