Add constructor taking group ID to MediaStreamDevice and StreamDeviceInfo

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 747 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);
+      device_infos.emplace_back(MEDIA_DEVICE_AUDIO_OUTPUT, entry.device_name,
+                                entry.unique_id, entry.group_id);
     }
   }
 
   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).
   for (const LabeledDeviceRequest& request : requests_) {
@@ skipping 1403 matching lines @@
       if (device_info.session_id == session_id &&
           device_info.device.type == type) {
         request->SetCapturingLinkSecured(is_secure);
         return;
       }
     }
   }
 }
 
 }  // namespace content