Revert 274823 "Support for audio output devices for getMediaDevi..."

content/renderer/media/media_stream_dispatcher.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 "content/renderer/media/media_stream_dispatcher.h"
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
@@ skipping 119 matching lines @@
                                                device_info.device.id));
 }
 
 void MediaStreamDispatcher::EnumerateDevices(
     int request_id,
     const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
     MediaStreamType type,
     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 << ")";
 
   for (RequestList::iterator it = requests_.begin(); it != requests_.end();
        ++it) {
     DCHECK(!it->IsThisRequest(request_id, event_handler));
   }
 
   requests_.push_back(Request(event_handler, request_id, next_ipc_id_));
   Send(new MediaStreamHostMsg_EnumerateDevices(routing_id(),
@@ skipping 140 matching lines @@
            << "{label = " << label << "})"
            << ", {device_id = " << device_info.device.id << "})";
 
   LabelStreamMap::iterator it = label_stream_map_.find(label);
   if (it == label_stream_map_.end()) {
     // This can happen if a user happen stop a the device from JS at the same
     // time as the underlying media device is unplugged from the system.
     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);
 
   if (stream->handler.get())
     stream->handler->OnDeviceStopped(label, device_info);
 
   if (stream->audio_array.empty() && stream->video_array.empty())
     label_stream_map_.erase(it);
 }
@@ skipping 17 matching lines @@
     int request_id,
     const std::string& label,
     const StreamDeviceInfo& device_info) {
   DCHECK(main_loop_->BelongsToCurrentThread());
   for (RequestList::iterator it = requests_.begin();
        it != requests_.end(); ++it) {
     Request& request = *it;
     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);
       } else {
         NOTREACHED();
       }
       label_stream_map_[label] = new_stream;
       if (request.handler.get()) {
         request.handler->OnDeviceOpened(request.request_id, label, device_info);
         DVLOG(1) << "MediaStreamDispatcher::OnDeviceOpened("
@@ skipping 40 matching lines @@
                                             int index) {
   LabelStreamMap::iterator it = label_stream_map_.find(label);
   if (it == label_stream_map_.end() ||
       it->second.video_array.size() <= static_cast<size_t>(index)) {
     return StreamDeviceInfo::kNoId;
   }
   return it->second.video_array[index].session_id;
 }
 
 }  // namespace content