Remove dead code related to media device enumerations and monitoring.

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 <stddef.h>
 
 #include <map>
@@ skipping 20 matching lines @@
   // Mirroring of a browser tab.
   MEDIA_TAB_AUDIO_CAPTURE,
   MEDIA_TAB_VIDEO_CAPTURE,
 
   // Desktop media sources.
   MEDIA_DESKTOP_VIDEO_CAPTURE,
 
   // Capture system audio (post-mix loopback stream).
   MEDIA_DESKTOP_AUDIO_CAPTURE,
 
-  // TODO(guidou): This is used for device enumerations, but it is not a
-  // media stream type. Remove when handling of renderer-generated enumeration
-  // requests is removed from MediaStreamManager. See http://crbug.com/648183.
-  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_PEPPER_ONLY  // Only used in requests made by Pepper.
 };
 
 // Facing mode for video capture.
 enum VideoFacingMode {
   MEDIA_VIDEO_FACING_NONE = 0,
   MEDIA_VIDEO_FACING_USER,
   MEDIA_VIDEO_FACING_ENVIRONMENT,
 
   NUM_MEDIA_VIDEO_FACING_MODE
@@ skipping 30 matching lines @@
 struct CONTENT_EXPORT MediaStreamDevice {
   MediaStreamDevice();
 
   MediaStreamDevice(MediaStreamType type,
                     const std::string& id,
                     const std::string& name);
 
   MediaStreamDevice(MediaStreamType type,
                     const std::string& id,
                     const std::string& name,
-                    const std::string& group_id);
-
-  MediaStreamDevice(MediaStreamType type,
-                    const std::string& id,
-                    const std::string& name,
-                    const std::string& group_id,
                     int sample_rate,
                     int channel_layout,
                     int frames_per_buffer);
 
   MediaStreamDevice(const MediaStreamDevice& other);
 
   ~MediaStreamDevice();
 
   bool IsEqual(const MediaStreamDevice& second) const;
 
   // The device's type.
   MediaStreamType type;
 
   // The device's unique ID.
   std::string id;
 
   // The facing mode for video capture device.
   VideoFacingMode video_facing;
 
   // The device id of a matched output device if any (otherwise empty).
   // Only applicable to audio devices.
   std::string matched_output_device_id;
 
   // The device's "friendly" name. Not guaranteed to be unique.
   std::string name;
 
-  // A unique identifier for the physical device this device is part of.
-  // Will be hashed before being sent to renderer.
-  // TODO(maxmorin): Add support for video devices as well.
-  std::string group_id;
-
   // Contains properties that match directly with those with the same name
   // in media::AudioParameters.
   // TODO(ajm): Remove this type and use media::AudioParameters directly.
   struct CONTENT_EXPORT AudioDeviceParameters {
     AudioDeviceParameters();
     AudioDeviceParameters(int sample_rate,
                           int channel_layout,
                           int frames_per_buffer);
     AudioDeviceParameters(const AudioDeviceParameters& other);
 
@@ skipping 128 matching lines @@
 
 // Callback used return results of media access requests.
 typedef base::Callback<void(const MediaStreamDevices& devices,
                             content::MediaStreamRequestResult result,
                             std::unique_ptr<MediaStreamUI> ui)>
     MediaResponseCallback;
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_