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/test_tools/quic_test_client.cc b/quic/test_tools/quic_test_client.cc
index f0d6a0d..ed823b1 100644
--- a/quic/test_tools/quic_test_client.cc
+++ b/quic/test_tools/quic_test_client.cc
@@ -20,7 +20,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_ptr_util.h"
#include "quic/platform/api/quic_stack_trace.h"
#include "quic/test_tools/crypto_test_utils.h"
#include "quic/test_tools/quic_client_peer.h"
@@ -236,7 +235,7 @@
epoll_server,
std::make_unique<MockableQuicClientEpollNetworkHelper>(epoll_server,
this),
- QuicWrapUnique(new RecordingProofVerifier(std::move(proof_verifier))),
+ std::make_unique<RecordingProofVerifier>(std::move(proof_verifier)),
std::move(session_cache)),
override_server_connection_id_(EmptyQuicConnectionId()),
server_connection_id_overridden_(false),
diff --git a/quic/test_tools/quic_test_server.cc b/quic/test_tools/quic_test_server.cc
index 55170b2..5f4738b 100644
--- a/quic/test_tools/quic_test_server.cc
+++ b/quic/test_tools/quic_test_server.cc
@@ -6,10 +6,10 @@
#include <utility>
+#include "absl/memory/memory.h"
#include "absl/strings/string_view.h"
#include "quic/core/quic_epoll_alarm_factory.h"
#include "quic/core/quic_epoll_connection_helper.h"
-#include "quic/platform/api/quic_ptr_util.h"
#include "quic/tools/quic_simple_crypto_server_stream_helper.h"
#include "quic/tools/quic_simple_dispatcher.h"
#include "quic/tools/quic_simple_server_session.h"
@@ -49,7 +49,7 @@
if (stream_factory_) {
QuicSpdyStream* stream =
stream_factory_->CreateStream(id, this, server_backend());
- ActivateStream(QuicWrapUnique(stream));
+ ActivateStream(absl::WrapUnique(stream));
return stream;
}
return QuicSimpleServerSession::CreateIncomingStream(id);
diff --git a/quic/test_tools/simple_quic_framer.cc b/quic/test_tools/simple_quic_framer.cc
index 96b1318..35d7edc 100644
--- a/quic/test_tools/simple_quic_framer.cc
+++ b/quic/test_tools/simple_quic_framer.cc
@@ -7,10 +7,10 @@
#include <memory>
#include <utility>
+#include "absl/memory/memory.h"
#include "absl/strings/string_view.h"
#include "quic/core/crypto/quic_decrypter.h"
#include "quic/core/crypto/quic_encrypter.h"
-#include "quic/platform/api/quic_ptr_util.h"
namespace quic {
namespace test {
@@ -73,7 +73,7 @@
// Save a copy of the data so it is valid after the packet is processed.
std::string* string_data =
new std::string(frame.data_buffer, frame.data_length);
- stream_data_.push_back(QuicWrapUnique(string_data));
+ stream_data_.push_back(absl::WrapUnique(string_data));
// TODO(ianswett): A pointer isn't necessary with emplace_back.
stream_frames_.push_back(std::make_unique<QuicStreamFrame>(
frame.stream_id, frame.fin, frame.offset,
@@ -85,7 +85,7 @@
// Save a copy of the data so it is valid after the packet is processed.
std::string* string_data =
new std::string(frame.data_buffer, frame.data_length);
- crypto_data_.push_back(QuicWrapUnique(string_data));
+ crypto_data_.push_back(absl::WrapUnique(string_data));
crypto_frames_.push_back(std::make_unique<QuicCryptoFrame>(
frame.level, frame.offset, absl::string_view(*string_data)));
return true;
