add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi

chrome/browser/ui/gtk/infobars/media_stream_infobar_gtk.cc

Index: chrome/browser/ui/gtk/infobars/media_stream_infobar_gtk.cc
diff --git a/chrome/browser/ui/gtk/infobars/media_stream_infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/media_stream_infobar_gtk.cc
index 6418ce3ba46f946519ace7cfc0265b89fc85fcc9..7dea210a694b61c40538ee96a077fa22118cfb1a 100644
--- a/chrome/browser/ui/gtk/infobars/media_stream_infobar_gtk.cc
+++ b/chrome/browser/ui/gtk/infobars/media_stream_infobar_gtk.cc
@@ -36,12 +36,12 @@ void MediaStreamInfoBarGtk::Init() {
   gtk_util::CenterWidgetInHBox(hbox_, hbox, false, 0);
   size_t offset = 0;
 
-  int message_id = IDS_MEDIA_CAPTURE_MIC_AND_VIDEO;
+  int message_id = IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO;
   DCHECK(GetDelegate()->has_audio() || GetDelegate()->has_video());
   if (!GetDelegate()->has_audio())
     message_id = IDS_MEDIA_CAPTURE_VIDEO_ONLY;
   else if (!GetDelegate()->has_video())
-    message_id = IDS_MEDIA_CAPTURE_MIC_ONLY;
+    message_id = IDS_MEDIA_CAPTURE_AUDIO_ONLY;
 
   string16 security_origin = UTF8ToUTF16(
       GetDelegate()->GetSecurityOrigin().spec());
@@ -82,7 +82,8 @@ void MediaStreamInfoBarGtk::OnAllowButton(GtkWidget* widget) {
       content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE, &audio_id);
   devices_menu_model_->GetSelectedDeviceId(
       content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE, &video_id);
-  GetDelegate()->Accept(audio_id, video_id);
+  bool always_allow = devices_menu_model_->IsAlwaysAllowChecked();
+  GetDelegate()->Accept(audio_id, video_id, always_allow);
   RemoveSelf();
 }