From ef10a4ceb667a6d27aa6bd0b067935b48fca57ab Mon Sep 17 00:00:00 2001
From: Harald Alvestrand <hta@webrtc.org>
Date: Mon, 3 Jun 2019 22:37:58 +0200
Subject: [PATCH] Remove deprecated JsepSession initializer

Also removes SessionDescription::Copy.

Bug: webrtc:10612
Change-Id: Ib652d717531738c3ed5d1054e32a03961e16dba9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/139903
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28239}
---
 api/jsep_session_description.h | 4 ----
 pc/jsep_session_description.cc | 7 -------
 pc/session_description.cc      | 4 ----
 pc/session_description.h       | 3 ---
 4 files changed, 18 deletions(-)

diff --git a/api/jsep_session_description.h b/api/jsep_session_description.h
index 5a38c3a0e8..79e15e21fe 100644
--- a/api/jsep_session_description.h
+++ b/api/jsep_session_description.h
@@ -48,10 +48,6 @@ class JsepSessionDescription : public SessionDescriptionInterface {
   bool Initialize(std::unique_ptr<cricket::SessionDescription> description,
                   const std::string& session_id,
                   const std::string& session_version);
-  // Backwards compatible version. Replace with version above.
-  RTC_DEPRECATED bool Initialize(cricket::SessionDescription* description,
-                                 const std::string& session_id,
-                                 const std::string& session_version);
 
   virtual cricket::SessionDescription* description() {
     return description_.get();
diff --git a/pc/jsep_session_description.cc b/pc/jsep_session_description.cc
index d9c1fad94d..001aa768c6 100644
--- a/pc/jsep_session_description.cc
+++ b/pc/jsep_session_description.cc
@@ -198,13 +198,6 @@ bool JsepSessionDescription::Initialize(
   return true;
 }
 
-bool JsepSessionDescription::Initialize(
-    cricket::SessionDescription* description,
-    const std::string& session_id,
-    const std::string& session_version) {
-  return Initialize(absl::WrapUnique(description), session_id, session_version);
-}
-
 bool JsepSessionDescription::AddCandidate(
     const IceCandidateInterface* candidate) {
   if (!candidate)
diff --git a/pc/session_description.cc b/pc/session_description.cc
index 476bf1af6a..4b6c08ae36 100644
--- a/pc/session_description.cc
+++ b/pc/session_description.cc
@@ -99,10 +99,6 @@ std::unique_ptr<SessionDescription> SessionDescription::Clone() const {
   return absl::WrapUnique(new SessionDescription(*this));
 }
 
-SessionDescription* SessionDescription::Copy() const {
-  return Clone().release();
-}
-
 const ContentInfo* SessionDescription::GetContentByName(
     const std::string& name) const {
   return FindContentInfoByName(contents_, name);
diff --git a/pc/session_description.h b/pc/session_description.h
index 0ff90a5340..91ffd09c13 100644
--- a/pc/session_description.h
+++ b/pc/session_description.h
@@ -624,9 +624,6 @@ class SessionDescription {
   ~SessionDescription();
 
   std::unique_ptr<SessionDescription> Clone() const;
-  // Older API - deprecated. Still expects caller to take ownership.
-  // Replace with Clone().
-  RTC_DEPRECATED SessionDescription* Copy() const;
 
   struct MediaTransportSetting;