Remove not-actually-a-platform-api quic_port_utils.h and use '0' instead of calling QuicPickServerPortForTestsOrDie() to return 0.
PiperOrigin-RevId: 436192603
diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc
index ebfb8fa..b1b9b4f 100644
--- a/quic/core/http/end_to_end_test.cc
+++ b/quic/core/http/end_to_end_test.cc
@@ -36,7 +36,6 @@
#include "quic/platform/api/quic_expect_bug.h"
#include "quic/platform/api/quic_flags.h"
#include "quic/platform/api/quic_logging.h"
-#include "quic/platform/api/quic_port_utils.h"
#include "quic/platform/api/quic_socket_address.h"
#include "quic/platform/api/quic_test.h"
#include "quic/platform/api/quic_test_loopback.h"
@@ -175,8 +174,7 @@
EndToEndTest()
: initialized_(false),
connect_to_server_on_initialize_(true),
- server_address_(QuicSocketAddress(TestLoopback(),
- QuicPickServerPortForTestsOrDie())),
+ server_address_(QuicSocketAddress(TestLoopback(), 0)),
server_hostname_("test.example.com"),
client_writer_(nullptr),
server_writer_(nullptr),
@@ -211,8 +209,6 @@
// Enable fixes for bugs found in tests and prod.
}
- ~EndToEndTest() override { QuicRecyclePort(server_address_.port()); }
-
virtual void CreateClientWithWriter() {
client_.reset(CreateQuicClient(client_writer_));
}
diff --git a/quic/platform/api/quic_port_utils.h b/quic/platform/api/quic_port_utils.h
deleted file mode 100644
index b1ddf6e..0000000
--- a/quic/platform/api/quic_port_utils.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_PORT_UTILS_H_
-#define QUICHE_QUIC_PLATFORM_API_QUIC_PORT_UTILS_H_
-
-namespace quic {
-
-// Returns a UDP port that is currently unused. Check-fails if none are
-// available. May return 0 in which case the bind() call will cause the OS
-// to use an unused port.
-inline int QuicPickServerPortForTestsOrDie() {
- return 0;
-}
-
-// Indicates that a specified port previously returned by
-// QuicPickServerPortForTestsOrDie is no longer used.
-inline void QuicRecyclePort(int /*port*/) {}
-
-} // namespace quic
-
-#endif // QUICHE_QUIC_PLATFORM_API_QUIC_PORT_UTILS_H_
diff --git a/quic/qbone/qbone_client_test.cc b/quic/qbone/qbone_client_test.cc
index 371a8b6..cd0a3b7 100644
--- a/quic/qbone/qbone_client_test.cc
+++ b/quic/qbone/qbone_client_test.cc
@@ -14,7 +14,6 @@
#include "quic/core/quic_epoll_connection_helper.h"
#include "quic/core/quic_packet_reader.h"
#include "quic/platform/api/quic_mutex.h"
-#include "quic/platform/api/quic_port_utils.h"
#include "quic/platform/api/quic_socket_address.h"
#include "quic/platform/api/quic_test.h"
#include "quic/platform/api/quic_test_loopback.h"
@@ -228,8 +227,7 @@
TEST_P(QboneClientTest, SendDataFromClient) {
auto server = new QboneTestServer(crypto_test_utils::ProofSourceForTesting());
- QuicSocketAddress server_address(TestLoopback(),
- QuicPickServerPortForTestsOrDie());
+ QuicSocketAddress server_address(TestLoopback(), 0);
ServerThread server_thread(server, server_address);
server_thread.Initialize();
server_address =
diff --git a/quic/qbone/qbone_session_test.cc b/quic/qbone/qbone_session_test.cc
index e787174..4f87602 100644
--- a/quic/qbone/qbone_session_test.cc
+++ b/quic/qbone/qbone_session_test.cc
@@ -9,7 +9,6 @@
#include "quic/core/quic_alarm_factory.h"
#include "quic/core/quic_epoll_alarm_factory.h"
#include "quic/platform/api/quic_expect_bug.h"
-#include "quic/platform/api/quic_port_utils.h"
#include "quic/platform/api/quic_test.h"
#include "quic/platform/api/quic_test_loopback.h"
#include "quic/qbone/platform/icmp_packet.h"
@@ -316,8 +315,7 @@
std::make_unique<DataSavingQboneControlHandler<QboneClientRequest>>();
server_handler_ =
std::make_unique<DataSavingQboneControlHandler<QboneServerRequest>>();
- QuicSocketAddress server_address(TestLoopback(),
- QuicPickServerPortForTestsOrDie());
+ QuicSocketAddress server_address(TestLoopback(), 0);
QuicSocketAddress client_address;
if (server_address.host().address_family() == IpAddressFamily::IP_V4) {
client_address = QuicSocketAddress(QuicIpAddress::Any4(), 0);
diff --git a/quic/tools/quic_client_test.cc b/quic/tools/quic_client_test.cc
index a8289a0..945f73c 100644
--- a/quic/tools/quic_client_test.cc
+++ b/quic/tools/quic_client_test.cc
@@ -13,7 +13,6 @@
#include "absl/strings/match.h"
#include "absl/strings/string_view.h"
#include "quic/platform/api/quic_epoll.h"
-#include "quic/platform/api/quic_port_utils.h"
#include "quic/platform/api/quic_test.h"
#include "quic/platform/api/quic_test_loopback.h"
#include "quic/test_tools/crypto_test_utils.h"
@@ -75,8 +74,7 @@
// Creates a new QuicClient and Initializes it on an unused port.
// Caller is responsible for deletion.
std::unique_ptr<QuicClient> CreateAndInitializeQuicClient() {
- uint16_t port = QuicPickServerPortForTestsOrDie();
- QuicSocketAddress server_address(QuicSocketAddress(TestLoopback(), port));
+ QuicSocketAddress server_address(QuicSocketAddress(TestLoopback(), 0));
QuicServerId server_id("hostname", server_address.port(), false);
ParsedQuicVersionVector versions = AllSupportedVersions();
auto client = std::make_unique<QuicClient>(
diff --git a/quic/tools/quic_server_test.cc b/quic/tools/quic_server_test.cc
index 80ab7f7..8059e7d 100644
--- a/quic/tools/quic_server_test.cc
+++ b/quic/tools/quic_server_test.cc
@@ -11,7 +11,6 @@
#include "quic/core/quic_utils.h"
#include "quic/platform/api/quic_flags.h"
#include "quic/platform/api/quic_logging.h"
-#include "quic/platform/api/quic_port_utils.h"
#include "quic/platform/api/quic_socket_address.h"
#include "quic/platform/api/quic_test.h"
#include "quic/platform/api/quic_test_loopback.h"
@@ -85,9 +84,7 @@
class QuicServerEpollInTest : public QuicTest {
public:
- QuicServerEpollInTest()
- : port_(QuicPickServerPortForTestsOrDie()),
- server_address_(TestLoopback(), port_) {}
+ QuicServerEpollInTest() : server_address_(TestLoopback(), 0) {}
void StartListening() {
server_.CreateUDPSocketAndListen(server_address_);
@@ -102,7 +99,6 @@
}
protected:
- int port_;
QuicSocketAddress server_address_;
TestQuicServer server_;
};
