Begin adding support for tab mirroring via the MediaStream audio/video capturing

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 ae79a72bfbeafd95f06864e17e80de0fe7146925..f33c8fea40c4062865c7d011de721b2973ddb071 100644
--- a/chrome/browser/ui/gtk/infobars/media_stream_infobar_gtk.cc
+++ b/chrome/browser/ui/gtk/infobars/media_stream_infobar_gtk.cc
@@ -45,7 +45,7 @@ void MediaStreamInfoBarGtk::Init() {
     message_id = IDS_MEDIA_CAPTURE_AUDIO_ONLY;
 
   string16 security_origin = UTF8ToUTF16(
-      GetDelegate()->GetSecurityOrigin().spec());
+      GetDelegate()->GetSecurityOriginSpec());
   string16 text(l10n_util::GetStringFUTF16(message_id,
                                            security_origin, &offset));
 
@@ -79,10 +79,8 @@ void MediaStreamInfoBarGtk::OnDevicesClicked(GtkWidget* sender) {
 
 void MediaStreamInfoBarGtk::OnAllowButton(GtkWidget* widget) {
   std::string audio_id, video_id;
-  devices_menu_model_->GetSelectedDeviceId(
-      content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE, &audio_id);
-  devices_menu_model_->GetSelectedDeviceId(
-      content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE, &video_id);
+  devices_menu_model_->GetSelectedAudioDeviceId(&audio_id);
+  devices_menu_model_->GetSelectedVideoDeviceId(&video_id);
   bool always_allow = devices_menu_model_->always_allow();
   GetDelegate()->Accept(audio_id, video_id, always_allow);
   RemoveSelf();