commit d9e9a7bc839125dd53c473ee636fa9ae67c2241f
author Harald Alvestrand <hta@webrtc.org> Tue Oct 01 07:24:06 2024
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Oct 01 08:30:13 2024
tree f9187eda5136577e54ccb5fe5e8c6d6514c7d133
parent f88236066e65762f5543bf0ac141f23b76849126

Remove deprecated AddTrack/RemoveTrack functions on MediaStream.

These have been deprecated since 2022.

Bug: None
Change-Id: I8340750f67e57c37601754345c679062c3c23436
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/364283
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43122}

api/media_stream_interface.h

diff --git a/api/media_stream_interface.h b/api/media_stream_interface.h
index 9547d4a..d7c0eda 100644
--- a/api/media_stream_interface.h
+++ b/api/media_stream_interface.h
@@ -351,23 +351,6 @@
   virtual bool RemoveTrack(rtc::scoped_refptr<VideoTrackInterface> track) {
     RTC_CHECK_NOTREACHED();
   }
-  // Deprecated: Should use scoped_refptr versions rather than pointers.
-  [[deprecated("Pass a scoped_refptr")]] virtual bool AddTrack(
-      AudioTrackInterface* track) {
-    return AddTrack(rtc::scoped_refptr<AudioTrackInterface>(track));
-  }
-  [[deprecated("Pass a scoped_refptr")]] virtual bool AddTrack(
-      VideoTrackInterface* track) {
-    return AddTrack(rtc::scoped_refptr<VideoTrackInterface>(track));
-  }
-  [[deprecated("Pass a scoped_refptr")]] virtual bool RemoveTrack(
-      AudioTrackInterface* track) {
-    return RemoveTrack(rtc::scoped_refptr<AudioTrackInterface>(track));
-  }
-  [[deprecated("Pass a scoped_refptr")]] virtual bool RemoveTrack(
-      VideoTrackInterface* track) {
-    return RemoveTrack(rtc::scoped_refptr<VideoTrackInterface>(track));
-  }
 
  protected:
   ~MediaStreamInterface() override = default;

api/test/mock_media_stream_interface.h

diff --git a/api/test/mock_media_stream_interface.h b/api/test/mock_media_stream_interface.h
index a22b940..c3087e7 100644
--- a/api/test/mock_media_stream_interface.h
+++ b/api/test/mock_media_stream_interface.h
@@ -116,11 +116,6 @@
               RemoveTrack,
               (rtc::scoped_refptr<VideoTrackInterface> track),
               (override));
-  // Old AddTrack/RemoveTrack methods - slated for removal
-  MOCK_METHOD(bool, AddTrack, (AudioTrackInterface * track), (override));
-  MOCK_METHOD(bool, AddTrack, (VideoTrackInterface * track), (override));
-  MOCK_METHOD(bool, RemoveTrack, (AudioTrackInterface * track), (override));
-  MOCK_METHOD(bool, RemoveTrack, (VideoTrackInterface * track), (override));
   MOCK_METHOD(void,
               RegisterObserver,
               (ObserverInterface * observer),