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

content/browser/renderer_host/media/media_stream_manager.cc

 // 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.
 
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 #include <algorithm>
@@ skipping 749 matching lines @@
 void MediaStreamManager::AudioOutputDevicesEnumerated(
     const AudioOutputDeviceEnumeration& device_enumeration) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DVLOG(1) << "AudioOutputDevicesEnumerated()";
   StreamDeviceInfoArray device_infos;
 
   if (device_enumeration.has_actual_devices) {
     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);
     }
   }
 
   const std::string log_message =
       "New device enumeration result:\n" +
       GetLogMessageString(MEDIA_DEVICE_AUDIO_OUTPUT, device_infos);
   SendMessageToNativeLog(log_message);
 
   // Publish the result for all requests waiting for device list(s).
@@ skipping 253 matching lines @@
 }
 
 void MediaStreamManager::TranslateDeviceIdToSourceId(
     DeviceRequest* request,
     MediaStreamDevice* device) {
   if (request->audio_type() == MEDIA_DEVICE_AUDIO_CAPTURE ||
       request->audio_type() == MEDIA_DEVICE_AUDIO_OUTPUT ||
       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);
   }
 }
 
 void MediaStreamManager::ClearEnumerationCache(EnumerationCache* cache) {
   DCHECK(CalledOnIOThread());
   cache->valid = false;
 }
 
 bool MediaStreamManager::EnumerationRequired(EnumerationCache* cache,
                                              MediaStreamType stream_type) {
@@ skipping 1128 matching lines @@
       if (device_info.session_id == session_id &&
           device_info.device.type == type) {
         request->SetCapturingLinkSecured(is_secure);
         return;
       }
     }
   }
 }
 
 }  // namespace content