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

chrome/browser/ui/views/infobars/media_stream_infobar.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 <algorithm>
 #include <string>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/ui/media_stream_infobar_delegate.h"
@@ skipping 52 matching lines @@
                                               views::View* child) {
   if (is_add && child == this && (label_ == NULL)) {
     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;
 
     label_ = CreateLabel(l10n_util::GetStringFUTF16(message_id,
-        UTF8ToUTF16(GetDelegate()->GetSecurityOrigin().spec())));
+        UTF8ToUTF16(GetDelegate()->GetSecurityOriginSpec())));
     AddChildView(label_);
 
     allow_button_ = CreateTextButton(this,
         l10n_util::GetStringUTF16(IDS_MEDIA_CAPTURE_ALLOW), false);
     AddChildView(allow_button_);
 
     deny_button_ = CreateTextButton(this,
         l10n_util::GetStringUTF16(IDS_MEDIA_CAPTURE_DENY), false);
     AddChildView(deny_button_);
 
     devices_menu_button_ = CreateMenuButton(
         l10n_util::GetStringUTF16(IDS_MEDIA_CAPTURE_DEVICES_MENU_TITLE), this);
     AddChildView(devices_menu_button_);
   }
 
   // This must happen after adding all other children so InfoBarView can ensure
   // the close button is the last child.
   InfoBarView::ViewHierarchyChanged(is_add, parent, child);
 }
 
 void MediaStreamInfoBar::ButtonPressed(views::Button* sender,
                                        const ui::Event& event) {
   if (!owned())
     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();
   } else if (sender == deny_button_) {
     GetDelegate()->Deny();
     RemoveSelf();
   } else {
     InfoBarView::ButtonPressed(sender, event);
   }
 }
@@ skipping 11 matching lines @@
   if (!owned())
     return;  // We're closing; don't call anything, it might access the owner.
   DCHECK_EQ(devices_menu_button_, source);
   RunMenuAt(&devices_menu_model_, devices_menu_button_,
             views::MenuItemView::TOPRIGHT);
 }
 
 MediaStreamInfoBarDelegate* MediaStreamInfoBar::GetDelegate() {
   return delegate()->AsMediaStreamInfoBarDelegate();
 }