From cbb8cb44e23384a5c291cf3e8fae6915a273e8a9 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Fri, 17 Dec 2021 05:54:28 +0000
Subject: [PATCH] Bug 1744346 simplify MediaDevice group id changes r=jib

Depends on D132879

Differential Revision: https://phabricator.services.mozilla.com/D132880
---
 dom/media/MediaManager.cpp | 13 +++++++------
 dom/media/MediaManager.h   |  5 ++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp
index 1d4462c78a50..9f3da72bb0d2 100644
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -892,10 +892,12 @@ MediaDevice::MediaDevice(const RefPtr<AudioDeviceInfo>& aAudioDeviceInfo,
   MOZ_ASSERT(mSinkInfo);
 }
 
-MediaDevice::MediaDevice(const RefPtr<MediaDevice>& aOther, const nsString& aID,
-                         const nsString& aGroupID, const nsString& aRawID,
-                         const nsString& aRawGroupID)
-    : MediaDevice(aOther, aID, aGroupID, aRawID, aRawGroupID, aOther->mName) {}
+/* static */
+RefPtr<MediaDevice> MediaDevice::CopyWithNewGroupId(
+    const RefPtr<MediaDevice>& aOther, const nsString& aGroupID) {
+  return new MediaDevice(aOther, aOther->mID, aGroupID, aOther->mRawID,
+                         aOther->mRawGroupID, aOther->mName);
+}
 
 MediaDevice::MediaDevice(const RefPtr<MediaDevice>& aOther, const nsString& aID,
                          const nsString& aGroupID, const nsString& aRawID,
@@ -1750,8 +1752,7 @@ void MediaManager::GuessVideoDeviceGroupIDs(MediaDeviceSet& aDevices,
       }
     }
     if (updateGroupId) {
-      aVideo = new MediaDevice(aVideo, aVideo->mID, newVideoGroupID,
-                               aVideo->mRawID, aVideo->mRawGroupID);
+      aVideo = MediaDevice::CopyWithNewGroupId(aVideo, newVideoGroupID);
       return true;
     }
     return false;
diff --git a/dom/media/MediaManager.h b/dom/media/MediaManager.h
index 2b948528ec7b..06447a8879c7 100644
--- a/dom/media/MediaManager.h
+++ b/dom/media/MediaManager.h
@@ -75,9 +75,8 @@ class MediaDevice : public nsIMediaDevice {
   MediaDevice(const RefPtr<AudioDeviceInfo>& aAudioDeviceInfo,
               const nsString& aID, const nsString& aGroupID);
 
-  MediaDevice(const RefPtr<MediaDevice>& aOther, const nsString& aID,
-              const nsString& aGroupID, const nsString& aRawID,
-              const nsString& aRawGroupID);
+  static RefPtr<MediaDevice> CopyWithNewGroupId(
+      const RefPtr<MediaDevice>& aOther, const nsString& aGroupID);
 
   MediaDevice(const RefPtr<MediaDevice>& aOther, const nsString& aID,
               const nsString& aGroupID, const nsString& aRawID,