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

Remove unnecessary overloads

Browse Source 
Bug: webrtc:13579
Change-Id: I6fbc1ea8fdc30b0d3e1084a941910027655c6feb
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/267062
Reviewed-by: Jonas Oreland <jonaso@webrtc.org>
Commit-Queue: Ali Tofigh <alito@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37377}
This commit is contained in:
Ali Tofigh 2022-06-28 11:56:18 +02:00 committed by WebRTC LUCI CQ
parent 9ea1ef649f
commit 42b163f236
5 changed files with 9 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
p2p/base/port_allocator.cc
View File

@ -313,16 +313,6 @@ std::vector<IceParameters> PortAllocator::GetPooledIceCredentials() {
return list; return list;
} }
PortAllocatorSession* PortAllocator::CreateSessionInternal(
const std::string& content_name,
int component,
const std::string& ice_ufrag,
const std::string& ice_pwd) {
return CreateSessionInternal(absl::string_view(content_name), component,
absl::string_view(ice_ufrag),
absl::string_view(ice_pwd));
}
Candidate PortAllocator::SanitizeCandidate(const Candidate& c) const { Candidate PortAllocator::SanitizeCandidate(const Candidate& c) const {
CheckRunOnValidThreadAndInitialized(); CheckRunOnValidThreadAndInitialized();
// For a local host candidate, we need to conceal its IP address candidate if // For a local host candidate, we need to conceal its IP address candidate if

5
p2p/base/port_allocator.h
View File

@ -605,11 +605,6 @@ class RTC_EXPORT PortAllocator : public sigslot::has_slots<> {
protected: protected:
// TODO(webrtc::13579): Remove std::string version once downstream users have // TODO(webrtc::13579): Remove std::string version once downstream users have
// migrated to the absl::string_view version. // migrated to the absl::string_view version.
virtual PortAllocatorSession* CreateSessionInternal(
const std::string& content_name,
int component,
const std::string& ice_ufrag,
const std::string& ice_pwd);
virtual PortAllocatorSession* CreateSessionInternal( virtual PortAllocatorSession* CreateSessionInternal(
absl::string_view content_name, absl::string_view content_name,
int component, int component,

4
p2p/base/port_interface.cc
View File

@ -20,8 +20,4 @@ PortInterface::PortInterface() = default;
PortInterface::~PortInterface() = default; PortInterface::~PortInterface() = default;
bool PortInterface::SupportsProtocol(const std::string& protocol) const {
return SupportsProtocol(absl::string_view(protocol));
}
} // namespace cricket } // namespace cricket

3
p2p/base/port_interface.h
View File

@ -61,9 +61,6 @@ class PortInterface {
virtual bool SharedSocket() const = 0; virtual bool SharedSocket() const = 0;
// TODO(webrtc:13579): Remove std::string version once downstream users have
// migrated to the absl::string_view version.
virtual bool SupportsProtocol(const std::string& protocol) const;
virtual bool SupportsProtocol(absl::string_view protocol) const = 0; virtual bool SupportsProtocol(absl::string_view protocol) const = 0;
// PrepareAddress will attempt to get an address for this port that other // PrepareAddress will attempt to get an address for this port that other

25
p2p/base/port_unittest.cc
View File

@ -3547,29 +3547,22 @@ TEST_F(PortTest, TestPortNotTimeoutUntilPruned) {
TEST_F(PortTest, TestSupportsProtocol) { TEST_F(PortTest, TestSupportsProtocol) {
auto udp_port = CreateUdpPort(kLocalAddr1); auto udp_port = CreateUdpPort(kLocalAddr1);
EXPECT_TRUE(udp_port->SupportsProtocol(absl::string_view(UDP_PROTOCOL_NAME))); EXPECT_TRUE(udp_port->SupportsProtocol(UDP_PROTOCOL_NAME));
EXPECT_FALSE( EXPECT_FALSE(udp_port->SupportsProtocol(TCP_PROTOCOL_NAME));
udp_port->SupportsProtocol(absl::string_view(TCP_PROTOCOL_NAME)));
auto stun_port = CreateStunPort(kLocalAddr1, nat_socket_factory1()); auto stun_port = CreateStunPort(kLocalAddr1, nat_socket_factory1());
EXPECT_TRUE( EXPECT_TRUE(stun_port->SupportsProtocol(UDP_PROTOCOL_NAME));
stun_port->SupportsProtocol(absl::string_view(UDP_PROTOCOL_NAME))); EXPECT_FALSE(stun_port->SupportsProtocol(TCP_PROTOCOL_NAME));
EXPECT_FALSE(
stun_port->SupportsProtocol(absl::string_view(TCP_PROTOCOL_NAME)));
auto tcp_port = CreateTcpPort(kLocalAddr1); auto tcp_port = CreateTcpPort(kLocalAddr1);
EXPECT_TRUE(tcp_port->SupportsProtocol(absl::string_view(TCP_PROTOCOL_NAME))); EXPECT_TRUE(tcp_port->SupportsProtocol(TCP_PROTOCOL_NAME));
EXPECT_TRUE( EXPECT_TRUE(tcp_port->SupportsProtocol(SSLTCP_PROTOCOL_NAME));
tcp_port->SupportsProtocol(absl::string_view(SSLTCP_PROTOCOL_NAME))); EXPECT_FALSE(tcp_port->SupportsProtocol(UDP_PROTOCOL_NAME));
EXPECT_FALSE(
tcp_port->SupportsProtocol(absl::string_view(UDP_PROTOCOL_NAME)));
auto turn_port = auto turn_port =
CreateTurnPort(kLocalAddr1, nat_socket_factory1(), PROTO_UDP, PROTO_UDP); CreateTurnPort(kLocalAddr1, nat_socket_factory1(), PROTO_UDP, PROTO_UDP);
EXPECT_TRUE( EXPECT_TRUE(turn_port->SupportsProtocol(UDP_PROTOCOL_NAME));
turn_port->SupportsProtocol(absl::string_view(UDP_PROTOCOL_NAME))); EXPECT_FALSE(turn_port->SupportsProtocol(TCP_PROTOCOL_NAME));
EXPECT_FALSE(
turn_port->SupportsProtocol(absl::string_view(TCP_PROTOCOL_NAME)));
} }
// Test that SetIceParameters updates the component, ufrag and password // Test that SetIceParameters updates the component, ufrag and password