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

chrome/browser/ui/views/infobars/media_stream_infobar.cc

Index: chrome/browser/ui/views/infobars/media_stream_infobar.cc
diff --git a/chrome/browser/ui/views/infobars/media_stream_infobar.cc b/chrome/browser/ui/views/infobars/media_stream_infobar.cc
index 19d35a6bf33ca94c2af0f59d73bc77b1927cfce9..7e0f0b29c30358ffa15a040cf42261becd19b5dd 100644
--- a/chrome/browser/ui/views/infobars/media_stream_infobar.cc
+++ b/chrome/browser/ui/views/infobars/media_stream_infobar.cc
@@ -70,7 +70,7 @@ void MediaStreamInfoBar::ViewHierarchyChanged(bool is_add,
       message_id = IDS_MEDIA_CAPTURE_AUDIO_ONLY;
 
     label_ = CreateLabel(l10n_util::GetStringFUTF16(message_id,
-        UTF8ToUTF16(GetDelegate()->GetSecurityOrigin().spec())));
+        UTF8ToUTF16(GetDelegate()->GetSecurityOriginSpec())));
     AddChildView(label_);
 
     allow_button_ = CreateTextButton(this,
@@ -97,10 +97,8 @@ void MediaStreamInfoBar::ButtonPressed(views::Button* sender,
     return;  // We're closing; don't call anything, it might access the owner.
   if (sender == allow_button_) {
     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_.GetSelectedAudioDeviceId(&video_id);
     bool always_allow = devices_menu_model_.always_allow();
     GetDelegate()->Accept(audio_id, video_id, always_allow);
     RemoveSelf();