commit b97d2fe896fe55dcf020ba15ef1ae3d7f5076250
author Harald Alvestrand <hta@webrtc.org> Fri Feb 28 11:54:40 2020 +0100
committer Commit Bot <commit-bot@chromium.org> Fri Mar 13 07:32:41 2020 +0000
tree a058da5e9c536cf0b362b3d8bd2fbf524e92e3a7
parent 4b6ba7c207903cab654769160d626ab42b1b152a

Remove cricket::SessionDescription::Copy()

To be submitted on or after March 13, 2020 (2 weeks after PSA).

Bug: webrtc:10701
Change-Id: Ie4b6d31e1496b81714fe9f9418694fc4c2e69ecd
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/169443
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30784}

pc/session_description.h

diff --git a/pc/session_description.h b/pc/session_description.h
index b7da8e0..901abc5 100644
--- a/pc/session_description.h
+++ b/pc/session_description.h
@@ -87,9 +87,6 @@
 
   virtual bool has_codecs() const = 0;
 
-  RTC_DEPRECATED virtual MediaContentDescription* Copy() const {
-    return CloneInternal();
-  }
   // Copy operator that returns an unique_ptr.
   // Not a virtual function.
   // If a type-specific variant of Clone() is desired, override it, or
@@ -349,9 +346,6 @@
  public:
   AudioContentDescription() {}
 
-  RTC_DEPRECATED virtual AudioContentDescription* Copy() const {
-    return CloneInternal();
-  }
   virtual MediaType type() const { return MEDIA_TYPE_AUDIO; }
   virtual AudioContentDescription* as_audio() { return this; }
   virtual const AudioContentDescription* as_audio() const { return this; }
@@ -364,9 +358,6 @@
 
 class VideoContentDescription : public MediaContentDescriptionImpl<VideoCodec> {
  public:
-  RTC_DEPRECATED virtual VideoContentDescription* Copy() const {
-    return CloneInternal();
-  }
   virtual MediaType type() const { return MEDIA_TYPE_VIDEO; }
   virtual VideoContentDescription* as_video() { return this; }
   virtual const VideoContentDescription* as_video() const { return this; }

pc/webrtc_sdp_unittest.cc

diff --git a/pc/webrtc_sdp_unittest.cc b/pc/webrtc_sdp_unittest.cc
index f79fbb8..b849f01 100644
--- a/pc/webrtc_sdp_unittest.cc
+++ b/pc/webrtc_sdp_unittest.cc
@@ -1195,8 +1195,8 @@
   // Turns the existing reference description into a plan B description,
   // with 2 audio tracks and 3 video tracks.
   void MakePlanBDescription() {
-    audio_desc_ = audio_desc_->Copy();
-    video_desc_ = video_desc_->Copy();
+    audio_desc_ = new AudioContentDescription(*audio_desc_);
+    video_desc_ = new VideoContentDescription(*video_desc_);
 
     StreamParams audio_track_2;
     audio_track_2.id = kAudioTrackId2;
@@ -1713,8 +1713,8 @@
   }
 
   void AddExtmap(bool encrypted) {
-    audio_desc_ = audio_desc_->Copy();
-    video_desc_ = video_desc_->Copy();
+    audio_desc_ = new AudioContentDescription(*audio_desc_);
+    video_desc_ = new VideoContentDescription(*video_desc_);
     audio_desc_->AddRtpHeaderExtension(
         RtpExtension(kExtmapUri, kExtmapId, encrypted));
     video_desc_->AddRtpHeaderExtension(
@@ -1794,8 +1794,8 @@
   }
 
   bool TestSerializeRejected(bool audio_rejected, bool video_rejected) {
-    audio_desc_ = audio_desc_->Copy();
-    video_desc_ = video_desc_->Copy();
+    audio_desc_ = new AudioContentDescription(*audio_desc_);
+    video_desc_ = new VideoContentDescription(*video_desc_);
 
     desc_.RemoveContentByName(kAudioContentName);
     desc_.RemoveContentByName(kVideoContentName);
@@ -1876,8 +1876,8 @@
     JsepSessionDescription new_jdesc(SdpType::kOffer);
     EXPECT_TRUE(SdpDeserialize(new_sdp, &new_jdesc));
 
-    audio_desc_ = audio_desc_->Copy();
-    video_desc_ = video_desc_->Copy();
+    audio_desc_ = new AudioContentDescription(*audio_desc_);
+    video_desc_ = new VideoContentDescription(*video_desc_);
     desc_.RemoveContentByName(kAudioContentName);
     desc_.RemoveContentByName(kVideoContentName);
     desc_.AddContent(kAudioContentName, MediaProtocolType::kRtp, audio_rejected,