Add constructor taking group ID to MediaStreamDevice and StreamDeviceInfo

content/public/common/media_stream_request.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/public/common/media_stream_request.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 
 namespace content {
@@ skipping 15 matching lines @@
           type == MEDIA_TAB_VIDEO_CAPTURE ||
           type == MEDIA_DESKTOP_AUDIO_CAPTURE ||
           type == MEDIA_DESKTOP_VIDEO_CAPTURE);
 }
 
 MediaStreamDevice::MediaStreamDevice()
     : type(MEDIA_NO_SERVICE),
       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;
   } else if (name.find("back") != std::string::npos) {
     video_facing = MEDIA_VIDEO_FACING_ENVIRONMENT;
   }
 #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;
 
 MediaStreamDevice::~MediaStreamDevice() {}
 
 bool MediaStreamDevice::IsEqual(const MediaStreamDevice& second) const {
   const AudioDeviceParameters& input_second = second.input;
   return type == second.type &&
       name == second.name &&
       id == second.id &&
@@ skipping 57 matching lines @@
       video_type(video_type),
       all_ancestors_have_same_origin(false) {
 }
 
 MediaStreamRequest::MediaStreamRequest(const MediaStreamRequest& other) =
     default;
 
 MediaStreamRequest::~MediaStreamRequest() {}
 
 }  // namespace content