admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup: remove unused sctp_content_name

Browse Source 
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}
This commit is contained in:
Harald Alvestrand 2020-02-05 12:07:33 +01:00 committed by Commit Bot
parent 72859e5e15
commit 1cb929fb9e
4 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pc/peer_connection.h
View File

@ -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;

16
pc/peer_connection_data_channel_unittest.cc
View File

@ -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());
}

1
pc/peer_connection_internal.h
View File

@ -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;

4
pc/test/fake_peer_connection_base.h
View File

@ -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;
}