Media Related changes for TabCapture API

content/common/media/media_stream_messages.h

 // 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.
 
 // IPC messages for the media streaming.
 // Multiply-included message file, hence no include guard.
 
 #include <string>
 
 #include "content/common/content_export.h"
 #include "content/common/media/media_stream_options.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 #define IPC_MESSAGE_START MediaStreamMsgStart
 
 IPC_ENUM_TRAITS(media_stream::MediaStreamType)
 
 IPC_STRUCT_TRAITS_BEGIN(media_stream::StreamOptions)
   IPC_STRUCT_TRAITS_MEMBER(audio_type)
+  IPC_STRUCT_TRAITS_MEMBER(audio_device_id)
   IPC_STRUCT_TRAITS_MEMBER(video_type)
+  IPC_STRUCT_TRAITS_MEMBER(video_device_id)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(media_stream::StreamDeviceInfo)
   IPC_STRUCT_TRAITS_MEMBER(stream_type)
   IPC_STRUCT_TRAITS_MEMBER(name)
   IPC_STRUCT_TRAITS_MEMBER(device_id)
   IPC_STRUCT_TRAITS_MEMBER(in_use)
   IPC_STRUCT_TRAITS_MEMBER(session_id)
 IPC_STRUCT_TRAITS_END()
 
@@ skipping 44 matching lines @@
 
 // Messages sent from the renderer to the browser.
 
 // Request a new media stream.
 IPC_MESSAGE_CONTROL4(MediaStreamHostMsg_GenerateStream,
                      int /* render view id */,
                      int /* request id */,
                      media_stream::StreamOptions /* components */,
                      GURL /* security origin */)
 
-// Request a new media stream for a specific device.
-IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_GenerateStreamForDevice,
-                     int /* render view id */,
-                     int /* request id */,
-                     media_stream::StreamOptions /* components */,
-                     std::string /* device_id */,
-                     GURL /* security origin */)
-
 // Request to cancel the request for a new media stream.
 IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CancelGenerateStream,
                      int /* render view id */,
                      int /* request id */)
 
 // Request to stop streaming from the media stream.
 IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_StopGeneratedStream,
                      int /* render view id */,
                      std::string /* label */)
 
 // Request to enumerate devices.
 IPC_MESSAGE_CONTROL4(MediaStreamHostMsg_EnumerateDevices,
                      int /* render view id */,
                      int /* request id */,
                      media_stream::MediaStreamType /* type */,
                      GURL /* security origin */)
 
 // Request to open the device.
 IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice,
                      int /* render view id */,
                      int /* request id */,
                      std::string /* device_id */,
                      media_stream::MediaStreamType /* type */,
                      GURL /* security origin */)