Remove dead code related to media device enumerations and monitoring.

content/public/common/media_stream_request.h

Index: content/public/common/media_stream_request.h
diff --git a/content/public/common/media_stream_request.h b/content/public/common/media_stream_request.h
index 2af33576169f900c770e109cfda2fbf7af1bc251..07a4e1af114d6adf49e2d65b1982c7ac1c1de92c 100644
--- a/content/public/common/media_stream_request.h
+++ b/content/public/common/media_stream_request.h
@@ -38,11 +38,6 @@ enum MediaStreamType {
   // 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
 };
 
@@ -50,7 +45,6 @@ enum MediaStreamType {
 enum MediaStreamRequestType {
   MEDIA_DEVICE_ACCESS = 0,
   MEDIA_GENERATE_STREAM,
-  MEDIA_ENUMERATE_DEVICES,
   MEDIA_OPEN_DEVICE_PEPPER_ONLY  // Only used in requests made by Pepper.
 };
 
@@ -101,12 +95,6 @@ struct CONTENT_EXPORT MediaStreamDevice {
   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);
@@ -133,11 +121,6 @@ struct CONTENT_EXPORT MediaStreamDevice {
   // 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.