Cleanup: remove unused sctp_content_name

This accessor seems to be unused, and has a name that we don't
want to support ("content_name").

Bug: none
Change-Id: I2f332176429dd8e1895f821d30e4beaaa4650ec2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168195
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30460}

4 files changed, 12 insertions, 18 deletions

diff --git a/pc/peer_connection.h b/pc/peer_connection.h
index 9065982f00..475029a4c3 100644
--- a/pc/peer_connection.h
+++ b/pc/peer_connection.h
@@ -283,11 +283,6 @@ class PeerConnection : public PeerConnectionInternal,
     return *data_channel_controller_.sctp_data_channels();
   }
 
-  absl::optional<std::string> sctp_content_name() const override {
-    RTC_DCHECK_RUN_ON(signaling_thread());
-    return sctp_mid_;
-  }
-
   absl::optional<std::string> sctp_transport_name() const override;
 
   cricket::CandidateStatsList GetPooledCandidateStats() const override;
@@ -324,6 +319,10 @@ class PeerConnection : public PeerConnectionInternal,
     return_histogram_very_quickly_ = true;
   }
   void RequestUsagePatternReportForTesting();
+  absl::optional<std::string> sctp_mid() {
+    RTC_DCHECK_RUN_ON(signaling_thread());
+    return sctp_mid_;
+  }
 
  protected:
   ~PeerConnection() override;
diff --git a/pc/peer_connection_data_channel_unittest.cc b/pc/peer_connection_data_channel_unittest.cc
index b063c39307..61c669b3ed 100644
--- a/pc/peer_connection_data_channel_unittest.cc
+++ b/pc/peer_connection_data_channel_unittest.cc
@@ -111,8 +111,8 @@ class PeerConnectionWrapperForDataChannelTest : public PeerConnectionWrapper {
     sctp_transport_factory_ = sctp_transport_factory;
   }
 
-  absl::optional<std::string> sctp_content_name() {
-    return GetInternalPeerConnection()->sctp_content_name();
+  absl::optional<std::string> sctp_mid() {
+    return GetInternalPeerConnection()->sctp_mid();
   }
 
   absl::optional<std::string> sctp_transport_name() {
@@ -248,14 +248,14 @@ TEST_P(PeerConnectionDataChannelTest, InternalSctpTransportDeletedOnTeardown) {
             nullptr);
 }
 
-// Test that sctp_content_name/sctp_transport_name (used for stats) are correct
+// Test that sctp_mid/sctp_transport_name (used for stats) are correct
 // before and after BUNDLE is negotiated.
 TEST_P(PeerConnectionDataChannelTest, SctpContentAndTransportNameSetCorrectly) {
   auto caller = CreatePeerConnection();
   auto callee = CreatePeerConnection();
 
   // Initially these fields should be empty.
-  EXPECT_FALSE(caller->sctp_content_name());
+  EXPECT_FALSE(caller->sctp_mid());
   EXPECT_FALSE(caller->sctp_transport_name());
 
   // Create offer with audio/video/data.
@@ -278,8 +278,8 @@ TEST_P(PeerConnectionDataChannelTest, SctpContentAndTransportNameSetCorrectly) {
       caller->SetLocalDescription(CloneSessionDescription(offer.get())));
   ASSERT_TRUE(callee->SetRemoteDescription(std::move(offer)));
 
-  ASSERT_TRUE(caller->sctp_content_name());
-  EXPECT_EQ(data_mid, *caller->sctp_content_name());
+  ASSERT_TRUE(caller->sctp_mid());
+  EXPECT_EQ(data_mid, *caller->sctp_mid());
   ASSERT_TRUE(caller->sctp_transport_name());
   EXPECT_EQ(data_mid, *caller->sctp_transport_name());
 
@@ -290,8 +290,8 @@ TEST_P(PeerConnectionDataChannelTest, SctpContentAndTransportNameSetCorrectly) {
   ASSERT_TRUE(
       caller->SetRemoteDescription(callee->CreateAnswerAndSetAsLocal()));
 
-  ASSERT_TRUE(caller->sctp_content_name());
-  EXPECT_EQ(data_mid, *caller->sctp_content_name());
+  ASSERT_TRUE(caller->sctp_mid());
+  EXPECT_EQ(data_mid, *caller->sctp_mid());
   ASSERT_TRUE(caller->sctp_transport_name());
   EXPECT_EQ(audio_mid, *caller->sctp_transport_name());
 }
diff --git a/pc/peer_connection_internal.h b/pc/peer_connection_internal.h
index a51ba4b8f6..52ffe85c2c 100644
--- a/pc/peer_connection_internal.h
+++ b/pc/peer_connection_internal.h
@@ -49,7 +49,6 @@ class PeerConnectionInternal : public PeerConnectionInterface {
   virtual std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels()
       const = 0;
 
-  virtual absl::optional<std::string> sctp_content_name() const = 0;
   virtual absl::optional<std::string> sctp_transport_name() const = 0;
 
   virtual cricket::CandidateStatsList GetPooledCandidateStats() const = 0;
diff --git a/pc/test/fake_peer_connection_base.h b/pc/test/fake_peer_connection_base.h
index 9f82c0a1b3..238013cb9b 100644
--- a/pc/test/fake_peer_connection_base.h
+++ b/pc/test/fake_peer_connection_base.h
@@ -257,10 +257,6 @@ class FakePeerConnectionBase : public PeerConnectionInternal {
     return {};
   }
 
-  absl::optional<std::string> sctp_content_name() const override {
-    return absl::nullopt;
-  }
-
   absl::optional<std::string> sctp_transport_name() const override {
     return absl::nullopt;
   }