| Index: content/renderer/media/media_stream_dispatcher.cc
|
| ===================================================================
|
| --- content/renderer/media/media_stream_dispatcher.cc (revision 278170)
|
| +++ content/renderer/media/media_stream_dispatcher.cc (working copy)
|
| @@ -137,8 +137,7 @@
|
| const GURL& security_origin) {
|
| DCHECK(main_loop_->BelongsToCurrentThread());
|
| DCHECK(type == MEDIA_DEVICE_AUDIO_CAPTURE ||
|
| - type == MEDIA_DEVICE_VIDEO_CAPTURE ||
|
| - type == MEDIA_DEVICE_AUDIO_OUTPUT);
|
| + type == MEDIA_DEVICE_VIDEO_CAPTURE);
|
| DVLOG(1) << "MediaStreamDispatcher::EnumerateDevices("
|
| << request_id << ")";
|
|
|
| @@ -299,7 +298,7 @@
|
| return;
|
| }
|
| Stream* stream = &it->second;
|
| - if (IsAudioInputMediaType(device_info.device.type))
|
| + if (IsAudioMediaType(device_info.device.type))
|
| RemoveStreamDeviceFromArray(device_info, &stream->audio_array);
|
| else
|
| RemoveStreamDeviceFromArray(device_info, &stream->video_array);
|
| @@ -337,7 +336,7 @@
|
| if (request.ipc_request == request_id) {
|
| Stream new_stream;
|
| new_stream.handler = request.handler;
|
| - if (IsAudioInputMediaType(device_info.device.type)) {
|
| + if (IsAudioMediaType(device_info.device.type)) {
|
| new_stream.audio_array.push_back(device_info);
|
| } else if (IsVideoMediaType(device_info.device.type)) {
|
| new_stream.video_array.push_back(device_info);
|
|
|