Allow modal mic+camera permission prompts in PRM codepath

chrome/browser/permissions/permission_dialog_delegate.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/permissions/permission_dialog_delegate.h"
 
 #include <utility>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 130 matching lines @@
         env, reinterpret_cast<uintptr_t>(this), tab_->GetJavaObject(),
         base::android::ToJavaIntArray(env, content_settings_types).obj(),
         ResourceMapper::MapFromChromiumId(infobar_delegate_->GetIconId()),
         ConvertUTF16ToJavaString(env, infobar_delegate_->GetMessageText()),
         ConvertUTF16ToJavaString(env, infobar_delegate_->GetLinkText()),
         primaryButtonText, secondaryButtonText,
         infobar_delegate_->ShouldShowPersistenceToggle()));
     return;
   }
 
-  // TODO(timloh): Handle grouped media permissions (camera + microphone).
-  DCHECK_EQ(1u, permission_prompt_->PermissionCount());
-
-  std::vector<int> content_settings_types{
-      permission_prompt_->GetContentSettingType(0)};
+  std::vector<int> content_settings_types;
+  for (size_t i = 0; i < permission_prompt_->PermissionCount(); ++i) {
+    content_settings_types.push_back(
+        permission_prompt_->GetContentSettingType(i));
+  }
 
   j_delegate_.Reset(Java_PermissionDialogDelegate_create(
       env, reinterpret_cast<uintptr_t>(this), tab_->GetJavaObject(),
       base::android::ToJavaIntArray(env, content_settings_types).obj(),
       ResourceMapper::MapFromChromiumId(permission_prompt_->GetIconId()),
       ConvertUTF16ToJavaString(env, permission_prompt_->GetMessageText()),
       ConvertUTF16ToJavaString(env, permission_prompt_->GetLinkText()),
       primaryButtonText, secondaryButtonText,
       permission_prompt_->ShouldShowPersistenceToggle()));
 }
@@ skipping 94 matching lines @@
       navigation_handle->IsSameDocument()) {
     return;
   }
 
   DismissDialog();
 }
 
 void PermissionDialogDelegate::WebContentsDestroyed() {
   DismissDialog();
 }