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

chrome/browser/ui/cocoa/infobars/media_stream_infobar_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/infobars/media_stream_infobar_controller.h"
 
 #import <Cocoa/Cocoa.h>
 #include <string>
 
 #import "base/sys_string_conversions.h"
@@ skipping 50 matching lines @@
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [deviceMenu_ removeAllItems];
   [super dealloc];
 }
 
 // Called when "Allow" button is pressed.
 - (void)ok:(id)sender {
   std::string audioId, videoId;
-  deviceMenuModel_->GetSelectedDeviceId(
-      content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE, &audioId);
-  deviceMenuModel_->GetSelectedDeviceId(
-      content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE, &videoId);
+  deviceMenuModel_->GetSelectedAudioDeviceId(&audioId);
+  deviceMenuModel_->GetSelectedVideoDeviceId(&videoId);
   bool alwaysAllow = deviceMenuModel_->always_allow();
 
   static_cast<MediaStreamInfoBarDelegate*>([self delegate])->Accept(
       audioId, videoId, alwaysAllow);
 
   // Remove the infobar, we're done.
   [super removeSelf];
 }
 
 // Called when "Deny" button is pressed.
@@ skipping 46 matching lines @@
 
   // Get the requested media type(s) and add corresponding text to the text
   // field.
   int messageId = IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO;
   DCHECK(delegate->HasAudio() || delegate->HasVideo());
   if (!delegate->HasAudio())
     messageId = IDS_MEDIA_CAPTURE_VIDEO_ONLY;
   else if (!delegate->HasVideo())
     messageId = IDS_MEDIA_CAPTURE_AUDIO_ONLY;
 
-  string16 securityOrigin = UTF8ToUTF16(delegate->GetSecurityOrigin().spec());
+  string16 securityOrigin = UTF8ToUTF16(delegate->GetSecurityOriginSpec());
   NSString* text = l10n_util::GetNSStringF(messageId, securityOrigin);
   [label1_ setStringValue:text];
 
   // Add text to the buttons.
   [okButton_ setTitle:GetNSStringWithFixup(IDS_MEDIA_CAPTURE_ALLOW)];
   [cancelButton_ setTitle:GetNSStringWithFixup(IDS_MEDIA_CAPTURE_DENY)];
 
   // Populating |deviceMenu_| is handled separately.
 }
 
@@ skipping 107 matching lines @@
     [[[deviceMenu_ menu] itemAtIndex:0] setTitle:@""];
     [[deviceMenu_ cell] setArrowPosition:NSPopUpArrowAtCenter];
   }
 }
 
 - (void)didChangeFrame:(NSNotification*)notification {
   [self arrangeInfobarLayout];
 }
 
 @end  // implementation MediaStreamInfoBarController