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

content/browser/renderer_host/media/media_stream_manager.cc

Index: content/browser/renderer_host/media/media_stream_manager.cc
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
index 0d549c72f8aec382eb1ace40b0d9b79e4d00dece..b79792f41d4eda0a90bd982205a866320367e88c 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -767,6 +767,7 @@ void MediaStreamManager::AudioOutputDevicesEnumerated(
     for (const auto& entry : device_enumeration.devices) {
       StreamDeviceInfo device_info(MEDIA_DEVICE_AUDIO_OUTPUT, entry.device_name,
                                    entry.unique_id);
+      device_info.device.group_id = entry.group_id;
       device_infos.push_back(device_info);
     }
   }
@@ -1040,6 +1041,9 @@ void MediaStreamManager::TranslateDeviceIdToSourceId(
       request->video_type() == MEDIA_DEVICE_VIDEO_CAPTURE) {
     device->id = GetHMACForMediaDeviceID(request->salt,
                                          request->security_origin, device->id);
+    if (!device->group_id.empty())
+      device->group_id = GetHMACForMediaDeviceID(
+          request->salt, request->security_origin, device->group_id);
   }
 }