Allow modal mic+camera permission prompts in PRM codepath

chrome/browser/permissions/permission_prompt_android.cc

Index: chrome/browser/permissions/permission_prompt_android.cc
diff --git a/chrome/browser/permissions/permission_prompt_android.cc b/chrome/browser/permissions/permission_prompt_android.cc
index 7e47372f443f4dc6e828f12d23e80b83059a97f4..616602293ffb1f0718022d32db914915a8e48277 100644
--- a/chrome/browser/permissions/permission_prompt_android.cc
+++ b/chrome/browser/permissions/permission_prompt_android.cc
@@ -29,15 +29,11 @@ void PermissionPromptAndroid::SetDelegate(Delegate* delegate) {
 }
 
 void PermissionPromptAndroid::Show() {
-  // Grouped permission requests are not yet supported in dialogs.
-  // TODO(timloh): Handle grouped media permissions (camera + microphone).
-  if (delegate_->Requests().size() == 1) {
-    bool has_gesture = delegate_->Requests()[0]->GetGestureType() ==
-                       PermissionRequestGestureType::GESTURE;
-    if (PermissionDialogDelegate::ShouldShowDialog(has_gesture)) {
-      PermissionDialogDelegate::Create(web_contents_, this);
-      return;
-    }
+  bool has_gesture = delegate_->Requests()[0]->GetGestureType() ==
+                     PermissionRequestGestureType::GESTURE;

[raymes, 2017/06/13 04:27:30]

Should this check all the requests? It looks a bit funny.

[Timothy Loh, 2017/06/14 04:56:43]

Done.

+  if (PermissionDialogDelegate::ShouldShowDialog(has_gesture)) {
+    PermissionDialogDelegate::Create(web_contents_, this);
+    return;
   }
 
   InfoBarService* infobar_service =