Media Related changes for TabCapture API

content/common/media/media_stream_options.h

Index: content/common/media/media_stream_options.h
diff --git a/content/common/media/media_stream_options.h b/content/common/media/media_stream_options.h
index ddd47dd0ddbb5f1a51b7b111e74a30daa4b552e5..08729ac6656a0fb2b18470fd20c8e371cabdd028 100644
--- a/content/common/media/media_stream_options.h
+++ b/content/common/media/media_stream_options.h
@@ -13,6 +13,11 @@
 
 namespace media_stream {
 
+// MediaStreamConstraint keys for constraints that are passed to getUserMedia.
+CONTENT_EXPORT extern const char kMediaStreamSource[];
+CONTENT_EXPORT extern const char kMediaStreamSourceId[];
+CONTENT_EXPORT extern const char kMediaStreamSourceTab[];
+
 typedef content::MediaStreamDeviceType MediaStreamType;
 
 // StreamOptions is a Chromium representation of WebKit's
@@ -23,12 +28,16 @@ struct CONTENT_EXPORT StreamOptions {
   // TODO(miu): Remove the 2-bools ctor in later clean-up CL.
   StreamOptions(bool user_audio, bool user_video);
   StreamOptions(MediaStreamType audio_type, MediaStreamType video_type);
+  StreamOptions(MediaStreamType audio_type, std::string audio_device_id,
+                MediaStreamType video_type, std::string video_device_id);
 
   // If not NO_SERVICE, the stream shall contain an audio input stream.
   MediaStreamType audio_type;
+  std::string audio_device_id;
 
   // If not NO_SERVICE, the stream shall contain a video input stream.
   MediaStreamType video_type;
+  std::string video_device_id;
 };
 
 // StreamDeviceInfo describes information about a device.