Move requests from GroupedPermissionInfoBarDelegate to PermissionPromptAndroid

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 e115345032c9935e6c79f72c118f22bf8a49a308..28cf978509cfb23dc60c8c241bbb17e6ce55b9fb 100644
--- a/chrome/browser/permissions/permission_prompt_android.h
+++ b/chrome/browser/permissions/permission_prompt_android.h
@@ -37,6 +37,8 @@ class PermissionPromptAndroid : public PermissionPrompt {
   void Accept();
   void Deny();
 
+  const std::vector<PermissionRequest*>& Requests() { return requests_; }

[dominickn, 2017/03/16 03:55:07]

Instead of exposing the requests directly, I think it's nicer to have
GetContentSettingsType etc methods on PermissionPromptAndroid which take a
position and then internally operate on the appropriate request.

Similarly PermissionCount() should delegate to PermissionPromptAndroid.

[Timothy Loh, 2017/03/17 00:47:27]

Done.

+
  private:
   // PermissionPromptAndroid is owned by PermissionRequestManager, so it should
   // be safe to hold a raw WebContents pointer here because this class is
@@ -47,6 +49,8 @@ class PermissionPromptAndroid : public PermissionPrompt {
   // |infobar_| is owned by the InfoBarService; we keep a pointer here so we can
   // ask the service to remove the infobar after it is added.
   infobars::InfoBar* infobar_;
+  // The current request being displayed (if any).
+  std::vector<PermissionRequest*> requests_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionPromptAndroid);
 };