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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/infobars/media_stream_infobar_gtk.h"
 
 #include <string>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
@@ skipping 27 matching lines @@
   size_t offset = 0;
 
   int message_id = IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO;
   DCHECK(GetDelegate()->HasAudio() || GetDelegate()->HasVideo());
   if (!GetDelegate()->HasAudio())
     message_id = IDS_MEDIA_CAPTURE_VIDEO_ONLY;
   else if (!GetDelegate()->HasVideo())
     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));
 
   gtk_box_pack_start(GTK_BOX(hbox), CreateLabel(UTF16ToUTF8(text)),
                      FALSE, FALSE, 0);
 
   GtkWidget* button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_MEDIA_CAPTURE_ALLOW).c_str());
   Signals()->Connect(button, "clicked",
                      G_CALLBACK(&OnAllowButtonThunk), this);
@@ skipping 13 matching lines @@
   gtk_widget_show_all(devices_menu_button);
   gtk_util::CenterWidgetInHBox(hbox_, devices_menu_button, true, 0);
 }
 
 void MediaStreamInfoBarGtk::OnDevicesClicked(GtkWidget* sender) {
   ShowMenuWithModel(sender, NULL, devices_menu_model_.get());
 }
 
 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();
 }
 
 void MediaStreamInfoBarGtk::OnDenyButton(GtkWidget* widget) {
   GetDelegate()->Deny();
   RemoveSelf();
 }
 
 MediaStreamInfoBarDelegate* MediaStreamInfoBarGtk::GetDelegate() {
   return delegate()->AsMediaStreamInfoBarDelegate();
 }