Decouple MediaStreamInfoBarDelegate from GroupedPermissionInfoBarDelegate

chrome/browser/permissions/permission_infobar_delegate.cc

Index: chrome/browser/permissions/permission_infobar_delegate.cc
diff --git a/chrome/browser/permissions/permission_infobar_delegate.cc b/chrome/browser/permissions/permission_infobar_delegate.cc
index 0c6d30f970979177b8bec6514f54501af634011a..f4883c3e67b181f1ea803b772767a39600c87a2c 100644
--- a/chrome/browser/permissions/permission_infobar_delegate.cc
+++ b/chrome/browser/permissions/permission_infobar_delegate.cc
@@ -37,8 +37,14 @@ PermissionInfoBarDelegate::PermissionInfoBarDelegate(
       user_gesture_(user_gesture),
       persist_(true) {}
 
+std::vector<int> PermissionInfoBarDelegate::content_settings() const {
+  return std::vector<int>(1, content_settings_type_);
+}
+
 bool PermissionInfoBarDelegate::ShouldShowPersistenceToggle() const {
-  return (permission_type_ == content::PermissionType::GEOLOCATION) &&
+  return (permission_type_ == content::PermissionType::GEOLOCATION ||
+          permission_type_ == content::PermissionType::AUDIO_CAPTURE ||
+          permission_type_ == content::PermissionType::VIDEO_CAPTURE) &&
          PermissionUtil::ShouldShowPersistenceToggle();
 }