Add constructor taking group ID to MediaStreamDevice and StreamDeviceInfo

content/public/common/media_stream_request.cc

Index: content/public/common/media_stream_request.cc
diff --git a/content/public/common/media_stream_request.cc b/content/public/common/media_stream_request.cc
index adef43281d7b2cdd57705e57bffd299935ccc913..9725335a60f85cb6605a500acabfc916c55fccdc 100644
--- a/content/public/common/media_stream_request.cc
+++ b/content/public/common/media_stream_request.cc
@@ -33,14 +33,15 @@ MediaStreamDevice::MediaStreamDevice()
       video_facing(MEDIA_VIDEO_FACING_NONE) {
 }
 
-MediaStreamDevice::MediaStreamDevice(
-    MediaStreamType type,
-    const std::string& id,
-    const std::string& name)
+MediaStreamDevice::MediaStreamDevice(MediaStreamType type,
+                                     const std::string& id,
+                                     const std::string& name,
+                                     const std::string& group_id)
     : type(type),
       id(id),
       video_facing(MEDIA_VIDEO_FACING_NONE),
-      name(name) {
+      name(name),
+      group_id(group_id) {
 #if defined(OS_ANDROID)
   if (name.find("front") != std::string::npos) {
     video_facing = MEDIA_VIDEO_FACING_USER;
@@ -50,19 +51,24 @@ MediaStreamDevice::MediaStreamDevice(
 #endif
 }
 
-MediaStreamDevice::MediaStreamDevice(
-    MediaStreamType type,
-    const std::string& id,
-    const std::string& name,
-    int sample_rate,
-    int channel_layout,
-    int frames_per_buffer)
+MediaStreamDevice::MediaStreamDevice(MediaStreamType type,
+                                     const std::string& id,
+                                     const std::string& name)
+    : MediaStreamDevice(type, id, name, std::string()) {}
+
+MediaStreamDevice::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)
     : type(type),
       id(id),
       video_facing(MEDIA_VIDEO_FACING_NONE),
       name(name),
-      input(sample_rate, channel_layout, frames_per_buffer) {
-}
+      group_id(group_id),
+      input(sample_rate, channel_layout, frames_per_buffer) {}
 
 MediaStreamDevice::MediaStreamDevice(const MediaStreamDevice& other) = default;