Remove QuicWrapUnique.
Use absl::WrapUnique directly instead.
Use make_unique instead of WrapUnique(new) in
quic/test_tools/quic_test_client.cc and quic/tools/quic_client.cc.
Add comment in quic/core/crypto/curve25519_key_exchange.cc about why make_unique
cannot be used, similar to the existing comment in
quic/masque/masque_epoll_client.cc.
PiperOrigin-RevId: 366474319
Change-Id: Ibfb5b8bc5ec8e93cba76f8de9b6ba9496a2636c6
diff --git a/quic/tools/quic_client.cc b/quic/tools/quic_client.cc
index 448291b..e659b4a 100644
--- a/quic/tools/quic_client.cc
+++ b/quic/tools/quic_client.cc
@@ -24,7 +24,6 @@
#include "quic/core/quic_server_id.h"
#include "quic/platform/api/quic_bug_tracker.h"
#include "quic/platform/api/quic_logging.h"
-#include "quic/platform/api/quic_ptr_util.h"
#include "quic/platform/api/quic_socket_address.h"
#include "quic/tools/quic_simple_client_session.h"
@@ -67,7 +66,7 @@
supported_versions,
QuicConfig(),
epoll_server,
- QuicWrapUnique(new QuicClientEpollNetworkHelper(epoll_server, this)),
+ std::make_unique<QuicClientEpollNetworkHelper>(epoll_server, this),
std::move(proof_verifier),
nullptr) {}
@@ -83,7 +82,7 @@
supported_versions,
QuicConfig(),
epoll_server,
- QuicWrapUnique(new QuicClientEpollNetworkHelper(epoll_server, this)),
+ std::make_unique<QuicClientEpollNetworkHelper>(epoll_server, this),
std::move(proof_verifier),
std::move(session_cache)) {}
@@ -100,7 +99,7 @@
supported_versions,
config,
epoll_server,
- QuicWrapUnique(new QuicClientEpollNetworkHelper(epoll_server, this)),
+ std::make_unique<QuicClientEpollNetworkHelper>(epoll_server, this),
std::move(proof_verifier),
std::move(session_cache)) {}
diff --git a/quic/tools/quic_simple_server_session.cc b/quic/tools/quic_simple_server_session.cc
index 044998c..7176b6f 100644
--- a/quic/tools/quic_simple_server_session.cc
+++ b/quic/tools/quic_simple_server_session.cc
@@ -6,12 +6,12 @@
#include <utility>
+#include "absl/memory/memory.h"
#include "quic/core/http/quic_spdy_session.h"
#include "quic/core/quic_connection.h"
#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_ptr_util.h"
#include "quic/tools/quic_simple_server_stream.h"
namespace quic {
@@ -101,7 +101,7 @@
QuicSpdyStream* stream = new QuicSimpleServerStream(
id, this, BIDIRECTIONAL, quic_simple_server_backend_);
- ActivateStream(QuicWrapUnique(stream));
+ ActivateStream(absl::WrapUnique(stream));
return stream;
}
@@ -109,7 +109,7 @@
PendingStream* pending) {
QuicSpdyStream* stream = new QuicSimpleServerStream(
pending, this, BIDIRECTIONAL, quic_simple_server_backend_);
- ActivateStream(QuicWrapUnique(stream));
+ ActivateStream(absl::WrapUnique(stream));
return stream;
}
@@ -128,7 +128,7 @@
QuicSimpleServerStream* stream = new QuicSimpleServerStream(
GetNextOutgoingUnidirectionalStreamId(), this, WRITE_UNIDIRECTIONAL,
quic_simple_server_backend_);
- ActivateStream(QuicWrapUnique(stream));
+ ActivateStream(absl::WrapUnique(stream));
return stream;
}
diff --git a/quic/tools/quic_simple_server_stream_test.cc b/quic/tools/quic_simple_server_stream_test.cc
index dd3b8cd..bf80d47 100644
--- a/quic/tools/quic_simple_server_stream_test.cc
+++ b/quic/tools/quic_simple_server_stream_test.cc
@@ -9,6 +9,7 @@
#include <utility>
#include "absl/base/macros.h"
+#include "absl/memory/memory.h"
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
#include "quic/core/crypto/null_encrypter.h"
@@ -18,7 +19,6 @@
#include "quic/core/quic_types.h"
#include "quic/core/quic_utils.h"
#include "quic/platform/api/quic_expect_bug.h"
-#include "quic/platform/api/quic_ptr_util.h"
#include "quic/platform/api/quic_socket_address.h"
#include "quic/platform/api/quic_test.h"
#include "quic/test_tools/crypto_test_utils.h"
@@ -280,7 +280,7 @@
connection_->transport_version(), 0),
&session_, BIDIRECTIONAL, &memory_cache_backend_);
// Register stream_ in dynamic_stream_map_ and pass ownership to session_.
- session_.ActivateStream(QuicWrapUnique(stream_));
+ session_.ActivateStream(absl::WrapUnique(stream_));
QuicConfigPeer::SetReceivedInitialSessionFlowControlWindow(
session_.config(), kMinimumFlowControlSendWindow);
QuicConfigPeer::SetReceivedInitialMaxStreamDataBytesUnidirectional(
@@ -488,7 +488,7 @@
GetNthServerInitiatedUnidirectionalStreamId(
connection_->transport_version(), 3),
&session_, WRITE_UNIDIRECTIONAL, &memory_cache_backend_);
- session_.ActivateStream(QuicWrapUnique(promised_stream));
+ session_.ActivateStream(absl::WrapUnique(promised_stream));
// Send a push response with response status 404, which will be regarded as
// invalid server push response.
@@ -655,7 +655,7 @@
auto server_initiated_stream =
new StrictMock<TestStream>(kServerInitiatedStreamId, &session_,
WRITE_UNIDIRECTIONAL, &memory_cache_backend_);
- session_.ActivateStream(QuicWrapUnique(server_initiated_stream));
+ session_.ActivateStream(absl::WrapUnique(server_initiated_stream));
const std::string kHost = "www.foo.com";
const std::string kPath = "/bar";
