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

content/public/common/media_stream_request.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.
 
 #ifndef CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 20 matching lines @@
   MEDIA_TAB_VIDEO_CAPTURE,
 
   // Desktop media sources.
   MEDIA_DESKTOP_VIDEO_CAPTURE,
 
   // Capture system audio (post-mix loopback stream).
   //
   // TODO(sergeyu): Replace with MEDIA_DESKTOP_AUDIO_CAPTURE.
   MEDIA_LOOPBACK_AUDIO_CAPTURE,
 
-  // This is used for enumerating audio output devices.
-  // TODO(grunell): Output isn't really a part of media streams. Device
-  // enumeration should be decoupled from media streams and related code.
-  MEDIA_DEVICE_AUDIO_OUTPUT,
-
   NUM_MEDIA_TYPES
 };
 
 // Types of media stream requests that can be made to the media controller.
 enum MediaStreamRequestType {
   MEDIA_DEVICE_ACCESS = 0,
   MEDIA_GENERATE_STREAM,
   MEDIA_ENUMERATE_DEVICES,
   MEDIA_OPEN_DEVICE  // Only used in requests made by Pepper.
 };
@@ skipping 19 matching lines @@
   MEDIA_DEVICE_TAB_CAPTURE_FAILURE,
   MEDIA_DEVICE_SCREEN_CAPTURE_FAILURE,
   MEDIA_DEVICE_CAPTURE_FAILURE,
   MEDIA_DEVICE_TRACK_START_FAILURE,
 
   NUM_MEDIA_REQUEST_RESULTS
 };
 
 // Convenience predicates to determine whether the given type represents some
 // audio or some video device.
-CONTENT_EXPORT bool IsAudioInputMediaType(MediaStreamType type);
+CONTENT_EXPORT bool IsAudioMediaType(MediaStreamType type);
 CONTENT_EXPORT bool IsVideoMediaType(MediaStreamType type);
 
 // TODO(xians): Change the structs to classes.
 // Represents one device in a request for media stream(s).
 struct CONTENT_EXPORT MediaStreamDevice {
   MediaStreamDevice();
 
   MediaStreamDevice(
       MediaStreamType type,
       const std::string& id,
@@ skipping 54 matching lines @@
     // in on the browser side and can be used by the renderer to match the
     // expected browser side settings and avoid unnecessary buffering.
     // See media::AudioParameters for more.
     int frames_per_buffer;
 
     // See media::AudioParameters::PlatformEffectsMask.
     int effects;
   };
 
   // These below two member variables are valid only when the type of device is
-  // audio (i.e. IsAudioInputMediaType returns true).
+  // audio (i.e. IsAudioMediaType returns true).
 
   // Contains the device properties of the capture device.
   AudioDeviceParameters input;
 
   // If the capture device has an associated output device (e.g. headphones),
   // this will contain the properties for the output device.  If no such device
   // exists (e.g. webcam w/mic), then the value of this member will be all
   // zeros.
   AudioDeviceParameters matched_output;
 };
@@ skipping 88 matching lines @@
 
 // Callback used return results of media access requests.
 typedef base::Callback<void(
     const MediaStreamDevices& devices,
     content::MediaStreamRequestResult result,
     scoped_ptr<MediaStreamUI> ui)> MediaResponseCallback;
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_