Permissions: Add new Infobar to support grouped permission requests on Android

chrome/browser/ui/android/infobars/confirm_infobar.cc

Index: chrome/browser/ui/android/infobars/confirm_infobar.cc
diff --git a/chrome/browser/ui/android/infobars/confirm_infobar.cc b/chrome/browser/ui/android/infobars/confirm_infobar.cc
index 9f0915e8cc976bba5bb768eca6edf5fcb4bbad4c..341608fa4931011857a64d70cbbddc5a39c62c6a 100644
--- a/chrome/browser/ui/android/infobars/confirm_infobar.cc
+++ b/chrome/browser/ui/android/infobars/confirm_infobar.cc
@@ -68,33 +68,23 @@ base::android::ScopedJavaLocalRef<jobject> ConfirmInfoBar::CreateRenderInfoBar(
   if (delegate->AsPermissionInfobarDelegate()) {
     content_settings.push_back(
         delegate->AsPermissionInfobarDelegate()->content_setting());
-  } else if (delegate->AsMediaStreamInfoBarDelegateAndroid()) {
-    MediaStreamInfoBarDelegateAndroid* media_delegate =
-        delegate->AsMediaStreamInfoBarDelegateAndroid();
-    if (media_delegate->IsRequestingVideoAccess()) {
-      content_settings.push_back(
-          ContentSettingsType::CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
-    }
-    if (media_delegate->IsRequestingMicrophoneAccess()) {
-      content_settings.push_back(
-          ContentSettingsType::CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
-    }
   }
 
+  return Java_ConfirmInfoBar_create(
+      env, GetWindowAndroid().obj(), GetEnumeratedIconId(), java_bitmap.obj(),
+      message_text.obj(), link_text.obj(), ok_button_text.obj(),
+      cancel_button_text.obj(),
+      base::android::ToJavaIntArray(env, content_settings).obj());
+}
+
+base::android::ScopedJavaLocalRef<jobject> ConfirmInfoBar::GetWindowAndroid() {
   content::WebContents* web_contents =
       InfoBarService::WebContentsFromInfoBar(this);
   DCHECK(web_contents);
   content::ContentViewCore* cvc =
       content::ContentViewCore::FromWebContents(web_contents);
   DCHECK(cvc);
-  base::android::ScopedJavaLocalRef<jobject> jwindow_android =
-      cvc->GetWindowAndroid()->GetJavaObject();
-
-  return Java_ConfirmInfoBar_create(
-      env, jwindow_android.obj(), GetEnumeratedIconId(), java_bitmap.obj(),
-      message_text.obj(), link_text.obj(), ok_button_text.obj(),
-      cancel_button_text.obj(),
-      base::android::ToJavaIntArray(env, content_settings).obj());
+  return cvc->GetWindowAndroid()->GetJavaObject();
 }
 
 void ConfirmInfoBar::OnLinkClicked(JNIEnv* env,