Reland of Add groupid for media devices. Group audio devices.

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 111 matching lines @@
   // 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 124 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_