Remove usages of QuicMakeUnique, Http2MakeUnique, SpdyMakeUnique. This is made possible by all embedders finally supporting C++14's std::make_unique, which is already used in more than 100 files in quic/. gfe-relnote: n/a, no functional change. PiperOrigin-RevId: 273935577 Change-Id: Icd6dd234422f286d897ea13ae609a67310f96380
diff --git a/http2/test_tools/frame_parts_collector.cc b/http2/test_tools/frame_parts_collector.cc index cb0e32b..083bbe1 100644 --- a/http2/test_tools/frame_parts_collector.cc +++ b/http2/test_tools/frame_parts_collector.cc
@@ -9,7 +9,6 @@ #include "testing/gtest/include/gtest/gtest.h" #include "net/third_party/quiche/src/http2/http2_structures_test_util.h" #include "net/third_party/quiche/src/http2/platform/api/http2_logging.h" -#include "net/third_party/quiche/src/http2/platform/api/http2_ptr_util.h" namespace http2 { namespace test { @@ -54,7 +53,7 @@ TestExpectedHeader(header); EXPECT_FALSE(IsInProgress()); if (current_frame_ == nullptr) { - current_frame_ = Http2MakeUnique<FrameParts>(header); + current_frame_ = std::make_unique<FrameParts>(header); } return current_frame(); } @@ -64,7 +63,7 @@ TestExpectedHeader(header); EXPECT_FALSE(IsInProgress()); if (current_frame_ == nullptr) { - current_frame_ = Http2MakeUnique<FrameParts>(header); + current_frame_ = std::make_unique<FrameParts>(header); } Http2FrameDecoderListener* result = current_frame(); collected_frames_.push_back(std::move(current_frame_)); @@ -96,7 +95,7 @@ // The decoder may detect an error before making any calls to the listener // regarding the frame, in which case current_frame_==nullptr and we need // to create a FrameParts instance. - current_frame_ = Http2MakeUnique<FrameParts>(header); + current_frame_ = std::make_unique<FrameParts>(header); } else { // Similarly, the decoder may have made calls to the listener regarding the // frame before detecting the error; for example, the DATA payload decoder
diff --git a/quic/core/chlo_extractor_test.cc b/quic/core/chlo_extractor_test.cc index 4da7810..aab0f65 100644 --- a/quic/core/chlo_extractor_test.cc +++ b/quic/core/chlo_extractor_test.cc
@@ -6,11 +6,11 @@ #include <memory> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/quic_framer.h" #include "net/third_party/quiche/src/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_arraysize.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/crypto_test_utils.h" #include "net/third_party/quiche/src/quic/test_tools/quic_test_utils.h"
diff --git a/quic/core/congestion_control/bbr2_simulator_test.cc b/quic/core/congestion_control/bbr2_simulator_test.cc index aa25c66..71f3048 100644 --- a/quic/core/congestion_control/bbr2_simulator_test.cc +++ b/quic/core/congestion_control/bbr2_simulator_test.cc
@@ -4,6 +4,7 @@ #include <memory> #include <sstream> +#include <utility> #include "net/third_party/quiche/src/quic/core/congestion_control/bbr2_misc.h" #include "net/third_party/quiche/src/quic/core/congestion_control/bbr2_sender.h" @@ -13,7 +14,6 @@ #include "net/third_party/quiche/src/quic/core/quic_types.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" #include "net/third_party/quiche/src/quic/platform/api/quic_optional.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/quic_connection_peer.h" #include "net/third_party/quiche/src/quic/test_tools/quic_sent_packet_manager_peer.h"
diff --git a/quic/core/congestion_control/bbr_sender_test.cc b/quic/core/congestion_control/bbr_sender_test.cc index 909107b..8ecab87 100644 --- a/quic/core/congestion_control/bbr_sender_test.cc +++ b/quic/core/congestion_control/bbr_sender_test.cc
@@ -7,13 +7,13 @@ #include <algorithm> #include <map> #include <memory> +#include <utility> #include "net/third_party/quiche/src/quic/core/congestion_control/rtt_stats.h" #include "net/third_party/quiche/src/quic/core/quic_packets.h" #include "net/third_party/quiche/src/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/mock_clock.h" #include "net/third_party/quiche/src/quic/test_tools/quic_config_peer.h"
diff --git a/quic/core/congestion_control/hybrid_slow_start_test.cc b/quic/core/congestion_control/hybrid_slow_start_test.cc index d17c7cc..05d771a 100644 --- a/quic/core/congestion_control/hybrid_slow_start_test.cc +++ b/quic/core/congestion_control/hybrid_slow_start_test.cc
@@ -5,8 +5,8 @@ #include "net/third_party/quiche/src/quic/core/congestion_control/hybrid_slow_start.h" #include <memory> +#include <utility> -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" namespace quic {
diff --git a/quic/core/congestion_control/pacing_sender_test.cc b/quic/core/congestion_control/pacing_sender_test.cc index 5b75cc9..3ca80cd 100644 --- a/quic/core/congestion_control/pacing_sender_test.cc +++ b/quic/core/congestion_control/pacing_sender_test.cc
@@ -5,12 +5,12 @@ #include "net/third_party/quiche/src/quic/core/congestion_control/pacing_sender.h" #include <memory> +#include <utility> #include "net/third_party/quiche/src/quic/core/quic_packets.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flag_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/mock_clock.h" #include "net/third_party/quiche/src/quic/test_tools/quic_test_utils.h"
diff --git a/quic/core/congestion_control/send_algorithm_test.cc b/quic/core/congestion_control/send_algorithm_test.cc index b676899..b363813 100644 --- a/quic/core/congestion_control/send_algorithm_test.cc +++ b/quic/core/congestion_control/send_algorithm_test.cc
@@ -6,13 +6,13 @@ #include <map> #include <memory> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/congestion_control/rtt_stats.h" #include "net/third_party/quiche/src/quic/core/congestion_control/send_algorithm_interface.h" #include "net/third_party/quiche/src/quic/core/quic_types.h" #include "net/third_party/quiche/src/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/mock_clock.h"
diff --git a/quic/core/congestion_control/tcp_cubic_sender_bytes_test.cc b/quic/core/congestion_control/tcp_cubic_sender_bytes_test.cc index 11b9660..4c51742 100644 --- a/quic/core/congestion_control/tcp_cubic_sender_bytes_test.cc +++ b/quic/core/congestion_control/tcp_cubic_sender_bytes_test.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include <cstdint> #include <memory> +#include <utility> #include "net/third_party/quiche/src/quic/core/congestion_control/rtt_stats.h" #include "net/third_party/quiche/src/quic/core/congestion_control/send_algorithm_interface.h" @@ -14,7 +15,6 @@ #include "net/third_party/quiche/src/quic/core/quic_packets.h" #include "net/third_party/quiche/src/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/mock_clock.h" #include "net/third_party/quiche/src/quic/test_tools/quic_config_peer.h"
diff --git a/quic/core/congestion_control/uber_loss_algorithm_test.cc b/quic/core/congestion_control/uber_loss_algorithm_test.cc index a63c3f7..8d69c13 100644 --- a/quic/core/congestion_control/uber_loss_algorithm_test.cc +++ b/quic/core/congestion_control/uber_loss_algorithm_test.cc
@@ -4,9 +4,10 @@ #include "net/third_party/quiche/src/quic/core/congestion_control/uber_loss_algorithm.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/congestion_control/rtt_stats.h" #include "net/third_party/quiche/src/quic/core/quic_utils.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/mock_clock.h" #include "net/third_party/quiche/src/quic/test_tools/quic_unacked_packet_map_peer.h"
diff --git a/quic/core/crypto/cert_compressor.cc b/quic/core/crypto/cert_compressor.cc index 09973dd..45d842d 100644 --- a/quic/core/crypto/cert_compressor.cc +++ b/quic/core/crypto/cert_compressor.cc
@@ -7,9 +7,9 @@ #include <cstdint> #include <memory> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/quic_utils.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "third_party/zlib/zlib.h" namespace quic {
diff --git a/quic/core/crypto/crypto_framer.cc b/quic/core/crypto/crypto_framer.cc index ffddb81..6feaa8a 100644 --- a/quic/core/crypto/crypto_framer.cc +++ b/quic/core/crypto/crypto_framer.cc
@@ -5,6 +5,7 @@ #include "net/third_party/quiche/src/quic/core/crypto/crypto_framer.h" #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h" #include "net/third_party/quiche/src/quic/core/quic_data_reader.h" @@ -12,7 +13,6 @@ #include "net/third_party/quiche/src/quic/core/quic_packets.h" #include "net/third_party/quiche/src/quic/platform/api/quic_fallthrough.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h"
diff --git a/quic/core/crypto/crypto_server_test.cc b/quic/core/crypto/crypto_server_test.cc index 6f41069..b869f8b 100644 --- a/quic/core/crypto/crypto_server_test.cc +++ b/quic/core/crypto/crypto_server_test.cc
@@ -7,6 +7,7 @@ #include <memory> #include <ostream> #include <string> +#include <utility> #include <vector> #include "third_party/boringssl/src/include/openssl/sha.h" @@ -23,7 +24,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_arraysize.h" #include "net/third_party/quiche/src/quic/platform/api/quic_endian.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h"
diff --git a/quic/core/crypto/crypto_utils.cc b/quic/core/crypto/crypto_utils.cc index 6406f8a..59cc967 100644 --- a/quic/core/crypto/crypto_utils.cc +++ b/quic/core/crypto/crypto_utils.cc
@@ -6,6 +6,7 @@ #include <memory> #include <string> +#include <utility> #include "third_party/boringssl/src/include/openssl/bytestring.h" #include "third_party/boringssl/src/include/openssl/hkdf.h" @@ -28,7 +29,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_arraysize.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" namespace quic {
diff --git a/quic/core/crypto/curve25519_key_exchange_test.cc b/quic/core/crypto/curve25519_key_exchange_test.cc index aeaf52f..5003668 100644 --- a/quic/core/crypto/curve25519_key_exchange_test.cc +++ b/quic/core/crypto/curve25519_key_exchange_test.cc
@@ -6,9 +6,9 @@ #include <memory> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/quic_random.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" namespace quic {
diff --git a/quic/core/crypto/p256_key_exchange_test.cc b/quic/core/crypto/p256_key_exchange_test.cc index 694fb62..5e81be4 100644 --- a/quic/core/crypto/p256_key_exchange_test.cc +++ b/quic/core/crypto/p256_key_exchange_test.cc
@@ -6,8 +6,8 @@ #include <memory> #include <string> +#include <utility> -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" namespace quic {
diff --git a/quic/core/crypto/quic_crypto_server_config.cc b/quic/core/crypto/quic_crypto_server_config.cc index 2ed0093..c211cdb 100644 --- a/quic/core/crypto/quic_crypto_server_config.cc +++ b/quic/core/crypto/quic_crypto_server_config.cc
@@ -8,6 +8,7 @@ #include <cstdlib> #include <memory> #include <string> +#include <utility> #include "third_party/boringssl/src/include/openssl/sha.h" #include "third_party/boringssl/src/include/openssl/ssl.h" @@ -43,7 +44,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_hostname_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_reference_counted.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h"
diff --git a/quic/core/crypto/quic_decrypter.cc b/quic/core/crypto/quic_decrypter.cc index 5802231..33c563f 100644 --- a/quic/core/crypto/quic_decrypter.cc +++ b/quic/core/crypto/quic_decrypter.cc
@@ -5,6 +5,7 @@ #include "net/third_party/quiche/src/quic/core/crypto/quic_decrypter.h" #include <string> +#include <utility> #include "third_party/boringssl/src/include/openssl/tls1.h" #include "net/third_party/quiche/src/quic/core/crypto/aes_128_gcm_12_decrypter.h" @@ -17,7 +18,6 @@ #include "net/third_party/quiche/src/quic/core/crypto/quic_hkdf.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" namespace quic {
diff --git a/quic/core/crypto/quic_encrypter.cc b/quic/core/crypto/quic_encrypter.cc index b4d3b0d..e26884c 100644 --- a/quic/core/crypto/quic_encrypter.cc +++ b/quic/core/crypto/quic_encrypter.cc
@@ -4,6 +4,8 @@ #include "net/third_party/quiche/src/quic/core/crypto/quic_encrypter.h" +#include <utility> + #include "third_party/boringssl/src/include/openssl/tls1.h" #include "net/third_party/quiche/src/quic/core/crypto/aes_128_gcm_12_encrypter.h" #include "net/third_party/quiche/src/quic/core/crypto/aes_128_gcm_encrypter.h" @@ -14,7 +16,6 @@ #include "net/third_party/quiche/src/quic/core/crypto/null_encrypter.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" namespace quic {
diff --git a/quic/core/crypto/transport_parameters.cc b/quic/core/crypto/transport_parameters.cc index 27b1f98..ce6cc20 100644 --- a/quic/core/crypto/transport_parameters.cc +++ b/quic/core/crypto/transport_parameters.cc
@@ -7,6 +7,7 @@ #include <cstdint> #include <cstring> #include <forward_list> +#include <utility> #include "third_party/boringssl/src/include/openssl/bytestring.h" #include "net/third_party/quiche/src/quic/core/crypto/crypto_framer.h" @@ -17,7 +18,6 @@ #include "net/third_party/quiche/src/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quic/core/quic_versions.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h" namespace quic {
diff --git a/quic/core/crypto/transport_parameters_test.cc b/quic/core/crypto/transport_parameters_test.cc index ed75f45..90afe22 100644 --- a/quic/core/crypto/transport_parameters_test.cc +++ b/quic/core/crypto/transport_parameters_test.cc
@@ -5,12 +5,12 @@ #include "net/third_party/quiche/src/quic/core/crypto/transport_parameters.h" #include <cstring> +#include <utility> #include "third_party/boringssl/src/include/openssl/mem.h" #include "net/third_party/quiche/src/quic/core/quic_versions.h" #include "net/third_party/quiche/src/quic/platform/api/quic_arraysize.h" #include "net/third_party/quiche/src/quic/platform/api/quic_ip_address.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/quic_test_utils.h"
diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc index 307b02f..991dae3 100644 --- a/quic/core/http/end_to_end_test.cc +++ b/quic/core/http/end_to_end_test.cc
@@ -30,7 +30,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" #include "net/third_party/quiche/src/quic/platform/api/quic_port_utils.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_sleep.h" #include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h"
diff --git a/quic/core/http/http_decoder_test.cc b/quic/core/http/http_decoder_test.cc index c841852..7548f6d 100644 --- a/quic/core/http/http_decoder_test.cc +++ b/quic/core/http/http_decoder_test.cc
@@ -4,10 +4,11 @@ #include "net/third_party/quiche/src/quic/core/http/http_decoder.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/http/http_encoder.h" #include "net/third_party/quiche/src/quic/core/quic_data_writer.h" #include "net/third_party/quiche/src/quic/platform/api/quic_arraysize.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h"
diff --git a/quic/core/http/quic_client_promised_info.cc b/quic/core/http/quic_client_promised_info.cc index 34ea5fd..607e16f 100644 --- a/quic/core/http/quic_client_promised_info.cc +++ b/quic/core/http/quic_client_promised_info.cc
@@ -9,7 +9,6 @@ #include "net/third_party/quiche/src/quic/core/http/spdy_server_push_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/spdy/core/spdy_protocol.h" using spdy::SpdyHeaderBlock;
diff --git a/quic/core/http/quic_client_promised_info_test.cc b/quic/core/http/quic_client_promised_info_test.cc index 83c4988..e244fcf 100644 --- a/quic/core/http/quic_client_promised_info_test.cc +++ b/quic/core/http/quic_client_promised_info_test.cc
@@ -6,12 +6,12 @@ #include <memory> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/http/quic_spdy_client_session.h" #include "net/third_party/quiche/src/quic/core/http/spdy_server_push_utils.h" #include "net/third_party/quiche/src/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/crypto_test_utils.h"
diff --git a/quic/core/http/quic_headers_stream_test.cc b/quic/core/http/quic_headers_stream_test.cc index b4bdb28..5019d95 100644 --- a/quic/core/http/quic_headers_stream_test.cc +++ b/quic/core/http/quic_headers_stream_test.cc
@@ -18,7 +18,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_expect_bug.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h"
diff --git a/quic/core/http/quic_receive_control_stream.cc b/quic/core/http/quic_receive_control_stream.cc index d3cb01b..b64aa4e 100644 --- a/quic/core/http/quic_receive_control_stream.cc +++ b/quic/core/http/quic_receive_control_stream.cc
@@ -4,11 +4,12 @@ #include "net/third_party/quiche/src/quic/core/http/quic_receive_control_stream.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/http/http_constants.h" #include "net/third_party/quiche/src/quic/core/http/http_decoder.h" #include "net/third_party/quiche/src/quic/core/http/quic_spdy_session.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" namespace quic {
diff --git a/quic/core/http/quic_send_control_stream_test.cc b/quic/core/http/quic_send_control_stream_test.cc index 4d3c0e8..89b8883 100644 --- a/quic/core/http/quic_send_control_stream_test.cc +++ b/quic/core/http/quic_send_control_stream_test.cc
@@ -4,6 +4,8 @@ #include "net/third_party/quiche/src/quic/core/http/quic_send_control_stream.h" +#include <utility> + #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h" #include "net/third_party/quiche/src/quic/test_tools/quic_config_peer.h" #include "net/third_party/quiche/src/quic/test_tools/quic_spdy_session_peer.h"
diff --git a/quic/core/http/quic_server_session_base_test.cc b/quic/core/http/quic_server_session_base_test.cc index 89dbf04..bc10fa2 100644 --- a/quic/core/http/quic_server_session_base_test.cc +++ b/quic/core/http/quic_server_session_base_test.cc
@@ -7,6 +7,7 @@ #include <cstdint> #include <memory> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/quic_crypto_server_config.h" #include "net/third_party/quiche/src/quic/core/crypto/quic_random.h"
diff --git a/quic/core/http/quic_spdy_client_session.cc b/quic/core/http/quic_spdy_client_session.cc index ac4f041..c6f99ff 100644 --- a/quic/core/http/quic_spdy_client_session.cc +++ b/quic/core/http/quic_spdy_client_session.cc
@@ -5,6 +5,7 @@ #include "net/third_party/quiche/src/quic/core/http/quic_spdy_client_session.h" #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h" #include "net/third_party/quiche/src/quic/core/http/quic_spdy_client_stream.h"
diff --git a/quic/core/http/quic_spdy_client_session_test.cc b/quic/core/http/quic_spdy_client_session_test.cc index 2fab3e1..88e8688 100644 --- a/quic/core/http/quic_spdy_client_session_test.cc +++ b/quic/core/http/quic_spdy_client_session_test.cc
@@ -6,6 +6,7 @@ #include <memory> #include <string> +#include <utility> #include <vector> #include "net/third_party/quiche/src/quic/core/crypto/null_decrypter.h"
diff --git a/quic/core/http/quic_spdy_client_stream_test.cc b/quic/core/http/quic_spdy_client_stream_test.cc index 6f8450e..ad85d02 100644 --- a/quic/core/http/quic_spdy_client_stream_test.cc +++ b/quic/core/http/quic_spdy_client_stream_test.cc
@@ -6,12 +6,12 @@ #include <memory> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/http/quic_spdy_client_session.h" #include "net/third_party/quiche/src/quic/core/http/spdy_utils.h" #include "net/third_party/quiche/src/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h"
diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc index 736edbf..d89584b 100644 --- a/quic/core/http/quic_spdy_session.cc +++ b/quic/core/http/quic_spdy_session.cc
@@ -19,7 +19,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_flag_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_stack_trace.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h"
diff --git a/quic/core/http/quic_spdy_stream.cc b/quic/core/http/quic_spdy_stream.cc index e4c209e..cd32507 100644 --- a/quic/core/http/quic_spdy_stream.cc +++ b/quic/core/http/quic_spdy_stream.cc
@@ -23,7 +23,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" #include "net/third_party/quiche/src/quic/platform/api/quic_mem_slice_storage.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h" #include "net/third_party/quiche/src/spdy/core/spdy_protocol.h"
diff --git a/quic/core/legacy_quic_stream_id_manager_test.cc b/quic/core/legacy_quic_stream_id_manager_test.cc index 9b73519..75e381d 100644 --- a/quic/core/legacy_quic_stream_id_manager_test.cc +++ b/quic/core/legacy_quic_stream_id_manager_test.cc
@@ -1,9 +1,12 @@ // Copyright (c) 2018 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. + #include "net/third_party/quiche/src/quic/core/legacy_quic_stream_id_manager.h" + +#include <utility> + #include "net/third_party/quiche/src/quic/core/quic_utils.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/quic_session_peer.h" #include "net/third_party/quiche/src/quic/test_tools/quic_test_utils.h"
diff --git a/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc b/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc index 996aa70..c7a05a8 100644 --- a/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc +++ b/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc
@@ -18,7 +18,6 @@ #include "net/third_party/quiche/src/quic/core/qpack/value_splitting_header_list.h" #include "net/third_party/quiche/src/quic/platform/api/quic_containers.h" #include "net/third_party/quiche/src/quic/platform/api/quic_fuzzed_data_provider.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/test_tools/qpack_encoder_peer.h" #include "net/third_party/quiche/src/spdy/core/spdy_header_block.h"
diff --git a/quic/core/qpack/offline/qpack_offline_decoder.cc b/quic/core/qpack/offline/qpack_offline_decoder.cc index 8a9251f..379cb6a 100644 --- a/quic/core/qpack/offline/qpack_offline_decoder.cc +++ b/quic/core/qpack/offline/qpack_offline_decoder.cc
@@ -13,7 +13,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_endian.h" #include "net/third_party/quiche/src/quic/platform/api/quic_file_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h" namespace quic {
diff --git a/quic/core/qpack/qpack_decoder.cc b/quic/core/qpack/qpack_decoder.cc index d4e5d91..1f64945 100644 --- a/quic/core/qpack/qpack_decoder.cc +++ b/quic/core/qpack/qpack_decoder.cc
@@ -4,9 +4,10 @@ #include "net/third_party/quiche/src/quic/core/qpack/qpack_decoder.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/qpack/qpack_index_conversions.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" namespace quic {
diff --git a/quic/core/qpack/qpack_encoder.cc b/quic/core/qpack/qpack_encoder.cc index b1f7fbe..418af8c 100644 --- a/quic/core/qpack/qpack_encoder.cc +++ b/quic/core/qpack/qpack_encoder.cc
@@ -13,7 +13,6 @@ #include "net/third_party/quiche/src/quic/core/qpack/qpack_required_insert_count.h" #include "net/third_party/quiche/src/quic/core/qpack/value_splitting_header_list.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" namespace quic {
diff --git a/quic/core/qpack/qpack_header_table_test.cc b/quic/core/qpack/qpack_header_table_test.cc index 96e4d0a..5638aff 100644 --- a/quic/core/qpack/qpack_header_table_test.cc +++ b/quic/core/qpack/qpack_header_table_test.cc
@@ -4,6 +4,8 @@ #include "net/third_party/quiche/src/quic/core/qpack/qpack_header_table.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/qpack/qpack_static_table.h" #include "net/third_party/quiche/src/quic/platform/api/quic_arraysize.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h"
diff --git a/quic/core/qpack/qpack_progressive_decoder.cc b/quic/core/qpack/qpack_progressive_decoder.cc index 0a43963..3c0b0f5 100644 --- a/quic/core/qpack/qpack_progressive_decoder.cc +++ b/quic/core/qpack/qpack_progressive_decoder.cc
@@ -6,12 +6,12 @@ #include <algorithm> #include <limits> +#include <utility> #include "net/third_party/quiche/src/quic/core/qpack/qpack_constants.h" #include "net/third_party/quiche/src/quic/core/qpack/qpack_index_conversions.h" #include "net/third_party/quiche/src/quic/core/qpack/qpack_required_insert_count.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" namespace quic {
diff --git a/quic/core/qpack/qpack_static_table.cc b/quic/core/qpack/qpack_static_table.cc index f1986f7..98a24c7 100644 --- a/quic/core/qpack/qpack_static_table.cc +++ b/quic/core/qpack/qpack_static_table.cc
@@ -6,7 +6,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_arraysize.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" namespace quic {
diff --git a/quic/core/quic_config.cc b/quic/core/quic_config.cc index 1b529fa..ccf64cf 100644 --- a/quic/core/quic_config.cc +++ b/quic/core/quic_config.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include <cstring> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/crypto_handshake_message.h" #include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h" @@ -18,7 +19,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" #include "net/third_party/quiche/src/quic/platform/api/quic_macros.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" #include "net/third_party/quiche/src/quic/platform/api/quic_uint128.h"
diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc index 60c6e1b..bbcbf95 100644 --- a/quic/core/quic_connection_test.cc +++ b/quic/core/quic_connection_test.cc
@@ -26,7 +26,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_expect_bug.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_reference_counted.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h"
diff --git a/quic/core/quic_control_frame_manager_test.cc b/quic/core/quic_control_frame_manager_test.cc index ac79386..d1723a1 100644 --- a/quic/core/quic_control_frame_manager_test.cc +++ b/quic/core/quic_control_frame_manager_test.cc
@@ -4,9 +4,10 @@ #include "net/third_party/quiche/src/quic/core/quic_control_frame_manager.h" +#include <utility> + #include "net/third_party/quiche/src/quic/platform/api/quic_expect_bug.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/quic_test_utils.h"
diff --git a/quic/core/quic_crypto_client_handshaker_test.cc b/quic/core/quic_crypto_client_handshaker_test.cc index b70ccb6..43c7efa 100644 --- a/quic/core/quic_crypto_client_handshaker_test.cc +++ b/quic/core/quic_crypto_client_handshaker_test.cc
@@ -4,6 +4,8 @@ #include "net/third_party/quiche/src/quic/core/quic_crypto_client_handshaker.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/proto/crypto_server_config_proto.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/quic_test_utils.h"
diff --git a/quic/core/quic_crypto_client_stream.cc b/quic/core/quic_crypto_client_stream.cc index 097fc9b..12b538f 100644 --- a/quic/core/quic_crypto_client_stream.cc +++ b/quic/core/quic_crypto_client_stream.cc
@@ -6,6 +6,7 @@ #include <memory> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h" #include "net/third_party/quiche/src/quic/core/crypto/crypto_utils.h" @@ -17,7 +18,6 @@ #include "net/third_party/quiche/src/quic/core/tls_client_handshaker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" namespace quic {
diff --git a/quic/core/quic_crypto_client_stream_test.cc b/quic/core/quic_crypto_client_stream_test.cc index 5b49fad..1001301 100644 --- a/quic/core/quic_crypto_client_stream_test.cc +++ b/quic/core/quic_crypto_client_stream_test.cc
@@ -6,6 +6,7 @@ #include <memory> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/aes_128_gcm_12_encrypter.h" #include "net/third_party/quiche/src/quic/core/crypto/quic_decrypter.h" @@ -15,7 +16,6 @@ #include "net/third_party/quiche/src/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_arraysize.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/crypto_test_utils.h" #include "net/third_party/quiche/src/quic/test_tools/quic_stream_peer.h"
diff --git a/quic/core/quic_crypto_server_stream.cc b/quic/core/quic_crypto_server_stream.cc index 266bb90..170e53b 100644 --- a/quic/core/quic_crypto_server_stream.cc +++ b/quic/core/quic_crypto_server_stream.cc
@@ -6,6 +6,7 @@ #include <memory> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h" #include "net/third_party/quiche/src/quic/core/crypto/crypto_utils.h" @@ -20,7 +21,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_flag_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" namespace quic {
diff --git a/quic/core/quic_crypto_server_stream_test.cc b/quic/core/quic_crypto_server_stream_test.cc index b73ea43..8d71f26 100644 --- a/quic/core/quic_crypto_server_stream_test.cc +++ b/quic/core/quic_crypto_server_stream_test.cc
@@ -6,6 +6,7 @@ #include <map> #include <memory> +#include <utility> #include <vector> #include "net/third_party/quiche/src/quic/core/crypto/aes_128_gcm_12_encrypter.h" @@ -24,7 +25,6 @@ #include "net/third_party/quiche/src/quic/core/quic_versions.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/crypto_test_utils.h"
diff --git a/quic/core/quic_crypto_stream_test.cc b/quic/core/quic_crypto_stream_test.cc index 4b2e2f7..f5933d2 100644 --- a/quic/core/quic_crypto_stream_test.cc +++ b/quic/core/quic_crypto_stream_test.cc
@@ -7,6 +7,7 @@ #include <cstdint> #include <memory> #include <string> +#include <utility> #include <vector> #include "net/third_party/quiche/src/quic/core/crypto/crypto_handshake.h"
diff --git a/quic/core/quic_dispatcher_test.cc b/quic/core/quic_dispatcher_test.cc index abae0f2..3240ceb 100644 --- a/quic/core/quic_dispatcher_test.cc +++ b/quic/core/quic_dispatcher_test.cc
@@ -7,6 +7,7 @@ #include <memory> #include <ostream> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/chlo_extractor.h" #include "net/third_party/quiche/src/quic/core/crypto/crypto_handshake.h"
diff --git a/quic/core/quic_flow_controller_test.cc b/quic/core/quic_flow_controller_test.cc index 0908246..e9854e9 100644 --- a/quic/core/quic_flow_controller_test.cc +++ b/quic/core/quic_flow_controller_test.cc
@@ -5,9 +5,9 @@ #include "net/third_party/quiche/src/quic/core/quic_flow_controller.h" #include <memory> +#include <utility> #include "net/third_party/quiche/src/quic/platform/api/quic_expect_bug.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/quic_connection_peer.h"
diff --git a/quic/core/quic_framer.cc b/quic/core/quic_framer.cc index 7c205cd..a759adb 100644 --- a/quic/core/quic_framer.cc +++ b/quic/core/quic_framer.cc
@@ -8,6 +8,7 @@ #include <cstdint> #include <memory> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/crypto_framer.h" #include "net/third_party/quiche/src/quic/core/crypto/crypto_handshake.h" @@ -39,7 +40,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" #include "net/third_party/quiche/src/quic/platform/api/quic_map_util.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_stack_trace.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h"
diff --git a/quic/core/quic_framer_test.cc b/quic/core/quic_framer_test.cc index b614faa..8aa9615 100644 --- a/quic/core/quic_framer_test.cc +++ b/quic/core/quic_framer_test.cc
@@ -9,6 +9,7 @@ #include <map> #include <memory> #include <string> +#include <utility> #include <vector> #include "net/third_party/quiche/src/quic/core/crypto/null_decrypter.h"
diff --git a/quic/core/quic_ietf_framer_test.cc b/quic/core/quic_ietf_framer_test.cc index 8c835eb..90ae8b9 100644 --- a/quic/core/quic_ietf_framer_test.cc +++ b/quic/core/quic_ietf_framer_test.cc
@@ -34,7 +34,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_arraysize.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/quic_framer_peer.h" #include "net/third_party/quiche/src/quic/test_tools/quic_test_utils.h"
diff --git a/quic/core/quic_packet_creator.cc b/quic/core/quic_packet_creator.cc index 1a2ca6f..07fa4b1 100644 --- a/quic/core/quic_packet_creator.cc +++ b/quic/core/quic_packet_creator.cc
@@ -8,6 +8,7 @@ #include <cstddef> #include <cstdint> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h" #include "net/third_party/quiche/src/quic/core/frames/quic_path_challenge_frame.h" @@ -23,7 +24,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_flag_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_server_stats.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h"
diff --git a/quic/core/quic_packet_creator_test.cc b/quic/core/quic_packet_creator_test.cc index 075b5b4..a647994 100644 --- a/quic/core/quic_packet_creator_test.cc +++ b/quic/core/quic_packet_creator_test.cc
@@ -8,6 +8,7 @@ #include <memory> #include <ostream> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/null_decrypter.h" #include "net/third_party/quiche/src/quic/core/crypto/null_encrypter.h"
diff --git a/quic/core/quic_packet_generator_test.cc b/quic/core/quic_packet_generator_test.cc index 70fe615..b098958 100644 --- a/quic/core/quic_packet_generator_test.cc +++ b/quic/core/quic_packet_generator_test.cc
@@ -7,6 +7,7 @@ #include <cstdint> #include <memory> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h" #include "net/third_party/quiche/src/quic/core/crypto/null_decrypter.h"
diff --git a/quic/core/quic_packet_writer.h b/quic/core/quic_packet_writer.h index 667254f..5f6b681 100644 --- a/quic/core/quic_packet_writer.h +++ b/quic/core/quic_packet_writer.h
@@ -6,10 +6,10 @@ #define QUICHE_QUIC_CORE_QUIC_PACKET_WRITER_H_ #include <cstddef> +#include <utility> #include "net/third_party/quiche/src/quic/core/quic_packets.h" #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h" namespace quic { @@ -22,7 +22,7 @@ // Returns a heap-allocated copy of |this|. // // The subclass implementation of this method should look like this: - // return QuicMakeUnique<MyAwesomePerPacketOptions>(*this); + // return std::make_unique<MyAwesomePerPacketOptions>(*this); // // This method is declared pure virtual in order to ensure the subclasses // would not forget to override it.
diff --git a/quic/core/quic_packets.cc b/quic/core/quic_packets.cc index 139fcda..dfe80cf 100644 --- a/quic/core/quic_packets.cc +++ b/quic/core/quic_packets.cc
@@ -4,13 +4,14 @@ #include "net/third_party/quiche/src/quic/core/quic_packets.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/quic_connection_id.h" #include "net/third_party/quiche/src/quic/core/quic_types.h" #include "net/third_party/quiche/src/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quic/core/quic_versions.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flag_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_utils.h"
diff --git a/quic/core/quic_sent_packet_manager_test.cc b/quic/core/quic_sent_packet_manager_test.cc index d5d47df..4ee9fd3 100644 --- a/quic/core/quic_sent_packet_manager_test.cc +++ b/quic/core/quic_sent_packet_manager_test.cc
@@ -5,11 +5,11 @@ #include "net/third_party/quiche/src/quic/core/quic_sent_packet_manager.h" #include <memory> +#include <utility> #include "net/third_party/quiche/src/quic/core/quic_pending_retransmission.h" #include "net/third_party/quiche/src/quic/platform/api/quic_arraysize.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/quic_config_peer.h"
diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc index 495d670..57bdee3 100644 --- a/quic/core/quic_session.cc +++ b/quic/core/quic_session.cc
@@ -18,6 +18,7 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" #include "net/third_party/quiche/src/quic/platform/api/quic_map_util.h" +#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_server_stats.h" #include "net/third_party/quiche/src/quic/platform/api/quic_stack_trace.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h"
diff --git a/quic/core/quic_stream_id_manager_test.cc b/quic/core/quic_stream_id_manager_test.cc index 093064f..7b7fb1a 100644 --- a/quic/core/quic_stream_id_manager_test.cc +++ b/quic/core/quic_stream_id_manager_test.cc
@@ -9,7 +9,6 @@ #include "net/third_party/quiche/src/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_expect_bug.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/quic_stream_id_manager_peer.h"
diff --git a/quic/core/quic_stream_sequencer_buffer_test.cc b/quic/core/quic_stream_sequencer_buffer_test.cc index 80d6309..028c12b 100644 --- a/quic/core/quic_stream_sequencer_buffer_test.cc +++ b/quic/core/quic_stream_sequencer_buffer_test.cc
@@ -12,7 +12,6 @@ #include <utility> #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/quic_stream_sequencer_buffer_peer.h"
diff --git a/quic/core/quic_stream_test.cc b/quic/core/quic_stream_test.cc index 3719638..0738e8e 100644 --- a/quic/core/quic_stream_test.cc +++ b/quic/core/quic_stream_test.cc
@@ -6,6 +6,7 @@ #include <memory> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/quic_connection.h" #include "net/third_party/quiche/src/quic/core/quic_constants.h"
diff --git a/quic/core/quic_time_wait_list_manager.cc b/quic/core/quic_time_wait_list_manager.cc index b8becf6..7058563 100644 --- a/quic/core/quic_time_wait_list_manager.cc +++ b/quic/core/quic_time_wait_list_manager.cc
@@ -7,6 +7,7 @@ #include <errno.h> #include <memory> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h" #include "net/third_party/quiche/src/quic/core/crypto/quic_decrypter.h" @@ -20,7 +21,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" #include "net/third_party/quiche/src/quic/platform/api/quic_map_util.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h"
diff --git a/quic/core/quic_time_wait_list_manager_test.cc b/quic/core/quic_time_wait_list_manager_test.cc index 57541ee..b07c83e 100644 --- a/quic/core/quic_time_wait_list_manager_test.cc +++ b/quic/core/quic_time_wait_list_manager_test.cc
@@ -7,6 +7,7 @@ #include <cerrno> #include <memory> #include <ostream> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h" #include "net/third_party/quiche/src/quic/core/crypto/null_encrypter.h" @@ -18,7 +19,6 @@ #include "net/third_party/quiche/src/quic/core/quic_packets.h" #include "net/third_party/quiche/src/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/platform/api/quic_uint128.h" #include "net/third_party/quiche/src/quic/test_tools/mock_quic_session_visitor.h"
diff --git a/quic/core/quic_write_blocked_list.h b/quic/core/quic_write_blocked_list.h index f77a2cd..7cab768 100644 --- a/quic/core/quic_write_blocked_list.h +++ b/quic/core/quic_write_blocked_list.h
@@ -7,13 +7,13 @@ #include <cstddef> #include <cstdint> +#include <utility> #include "net/third_party/quiche/src/quic/core/quic_packets.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_containers.h" #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" #include "net/third_party/quiche/src/quic/platform/api/quic_map_util.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/spdy/core/fifo_write_scheduler.h" #include "net/third_party/quiche/src/spdy/core/http2_priority_write_scheduler.h" #include "net/third_party/quiche/src/spdy/core/lifo_write_scheduler.h" @@ -82,22 +82,22 @@ switch (type) { case spdy::WriteSchedulerType::LIFO: priority_write_scheduler_ = - QuicMakeUnique<spdy::LifoWriteScheduler<QuicStreamId>>(); + std::make_unique<spdy::LifoWriteScheduler<QuicStreamId>>(); break; case spdy::WriteSchedulerType::SPDY: priority_write_scheduler_ = - QuicMakeUnique<spdy::PriorityWriteScheduler<QuicStreamId>>( + std::make_unique<spdy::PriorityWriteScheduler<QuicStreamId>>( QuicVersionUsesCryptoFrames(version) ? std::numeric_limits<QuicStreamId>::max() : 0); break; case spdy::WriteSchedulerType::HTTP2: priority_write_scheduler_ = - QuicMakeUnique<spdy::Http2PriorityWriteScheduler<QuicStreamId>>(); + std::make_unique<spdy::Http2PriorityWriteScheduler<QuicStreamId>>(); break; case spdy::WriteSchedulerType::FIFO: priority_write_scheduler_ = - QuicMakeUnique<spdy::FifoWriteScheduler<QuicStreamId>>(); + std::make_unique<spdy::FifoWriteScheduler<QuicStreamId>>(); break; default: QUIC_BUG << "Scheduler is not supported for type: "
diff --git a/quic/core/tls_handshaker_test.cc b/quic/core/tls_handshaker_test.cc index 1d3f8f3..c23d56b 100644 --- a/quic/core/tls_handshaker_test.cc +++ b/quic/core/tls_handshaker_test.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/tls_client_connection.h" #include "net/third_party/quiche/src/quic/core/crypto/tls_server_connection.h" @@ -11,7 +12,6 @@ #include "net/third_party/quiche/src/quic/core/tls_server_handshaker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_arraysize.h" #include "net/third_party/quiche/src/quic/platform/api/quic_expect_bug.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/crypto_test_utils.h" #include "net/third_party/quiche/src/quic/test_tools/fake_proof_source.h"
diff --git a/quic/core/tls_server_handshaker.cc b/quic/core/tls_server_handshaker.cc index eb697f1..f08f781 100644 --- a/quic/core/tls_server_handshaker.cc +++ b/quic/core/tls_server_handshaker.cc
@@ -12,7 +12,6 @@ #include "net/third_party/quiche/src/quic/core/crypto/quic_crypto_server_config.h" #include "net/third_party/quiche/src/quic/core/crypto/transport_parameters.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" namespace quic {
diff --git a/quic/core/uber_received_packet_manager_test.cc b/quic/core/uber_received_packet_manager_test.cc index eecc98b..b1e7140 100644 --- a/quic/core/uber_received_packet_manager_test.cc +++ b/quic/core/uber_received_packet_manager_test.cc
@@ -4,11 +4,12 @@ #include "net/third_party/quiche/src/quic/core/uber_received_packet_manager.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/congestion_control/rtt_stats.h" #include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h" #include "net/third_party/quiche/src/quic/core/quic_connection_stats.h" #include "net/third_party/quiche/src/quic/core/quic_utils.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/mock_clock.h"
diff --git a/quic/qbone/bonnet/tun_device_packet_exchanger.cc b/quic/qbone/bonnet/tun_device_packet_exchanger.cc index 94aeba1..799247c 100644 --- a/quic/qbone/bonnet/tun_device_packet_exchanger.cc +++ b/quic/qbone/bonnet/tun_device_packet_exchanger.cc
@@ -4,7 +4,8 @@ #include "net/third_party/quiche/src/quic/qbone/bonnet/tun_device_packet_exchanger.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" +#include <utility> + #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" namespace quic {
diff --git a/quic/qbone/platform/netlink.cc b/quic/qbone/platform/netlink.cc index 6553417..da68e54 100644 --- a/quic/qbone/platform/netlink.cc +++ b/quic/qbone/platform/netlink.cc
@@ -5,12 +5,12 @@ #include "net/third_party/quiche/src/quic/qbone/platform/netlink.h" #include <linux/fib_rules.h> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/quic_random.h" #include "net/third_party/quiche/src/quic/platform/api/quic_fallthrough.h" #include "net/third_party/quiche/src/quic/platform/api/quic_ip_address.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" #include "net/quic/platform/impl/quic_ip_address_impl.h" #include "net/third_party/quiche/src/quic/qbone/platform/rtnetlink_message.h"
diff --git a/quic/qbone/platform/netlink_test.cc b/quic/qbone/platform/netlink_test.cc index 144e5d5..7bd5f6b 100644 --- a/quic/qbone/platform/netlink_test.cc +++ b/quic/qbone/platform/netlink_test.cc
@@ -4,9 +4,10 @@ #include "net/third_party/quiche/src/quic/qbone/platform/netlink.h" +#include <utility> + #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_containers.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/qbone/platform/mock_kernel.h" #include "net/third_party/quiche/src/quic/qbone/qbone_constants.h"
diff --git a/quic/qbone/platform/rtnetlink_message.cc b/quic/qbone/platform/rtnetlink_message.cc index 5febbd7..d52e725 100644 --- a/quic/qbone/platform/rtnetlink_message.cc +++ b/quic/qbone/platform/rtnetlink_message.cc
@@ -4,7 +4,7 @@ #include "net/third_party/quiche/src/quic/qbone/platform/rtnetlink_message.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" +#include <utility> namespace quic {
diff --git a/quic/qbone/qbone_client.cc b/quic/qbone/qbone_client.cc index 86bd477..e585d05 100644 --- a/quic/qbone/qbone_client.cc +++ b/quic/qbone/qbone_client.cc
@@ -4,11 +4,12 @@ #include "net/third_party/quiche/src/quic/qbone/qbone_client.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/quic_epoll_alarm_factory.h" #include "net/third_party/quiche/src/quic/core/quic_epoll_connection_helper.h" #include "net/third_party/quiche/src/quic/platform/api/quic_epoll.h" #include "net/third_party/quiche/src/quic/platform/api/quic_exported_stats.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/qbone/qbone_stream.h" namespace quic {
diff --git a/quic/qbone/qbone_client_session.cc b/quic/qbone/qbone_client_session.cc index 5f82570..e59596d 100644 --- a/quic/qbone/qbone_client_session.cc +++ b/quic/qbone/qbone_client_session.cc
@@ -4,8 +4,9 @@ #include "net/third_party/quiche/src/quic/qbone/qbone_client_session.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/quic_types.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/qbone/qbone_constants.h" namespace quic {
diff --git a/quic/qbone/qbone_packet_exchanger.cc b/quic/qbone/qbone_packet_exchanger.cc index c8dcffa..d06376d 100644 --- a/quic/qbone/qbone_packet_exchanger.cc +++ b/quic/qbone/qbone_packet_exchanger.cc
@@ -4,7 +4,7 @@ #include "net/third_party/quiche/src/quic/qbone/qbone_packet_exchanger.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" +#include <utility> namespace quic {
diff --git a/quic/qbone/qbone_packet_exchanger_test.cc b/quic/qbone/qbone_packet_exchanger_test.cc index e507a1d..f572177 100644 --- a/quic/qbone/qbone_packet_exchanger_test.cc +++ b/quic/qbone/qbone_packet_exchanger_test.cc
@@ -4,7 +4,8 @@ #include "net/third_party/quiche/src/quic/qbone/qbone_packet_exchanger.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" +#include <utility> + #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/qbone/mock_qbone_client.h"
diff --git a/quic/qbone/qbone_packet_processor_test.cc b/quic/qbone/qbone_packet_processor_test.cc index 2e1b4de..f7e642a 100644 --- a/quic/qbone/qbone_packet_processor_test.cc +++ b/quic/qbone/qbone_packet_processor_test.cc
@@ -4,7 +4,8 @@ #include "net/third_party/quiche/src/quic/qbone/qbone_packet_processor.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" +#include <utility> + #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/qbone/qbone_packet_processor_test_tools.h"
diff --git a/quic/qbone/qbone_server_session.cc b/quic/qbone/qbone_server_session.cc index e9515c2..2b4a736 100644 --- a/quic/qbone/qbone_server_session.cc +++ b/quic/qbone/qbone_server_session.cc
@@ -4,10 +4,11 @@ #include "net/third_party/quiche/src/quic/qbone/qbone_server_session.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/quic_connection_id.h" #include "net/third_party/quiche/src/quic/core/quic_types.h" #include "net/third_party/quiche/src/quic/core/quic_utils.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/qbone/qbone_constants.h" namespace quic {
diff --git a/quic/qbone/qbone_session_base.cc b/quic/qbone/qbone_session_base.cc index 01917d2..62bcaa4 100644 --- a/quic/qbone/qbone_session_base.cc +++ b/quic/qbone/qbone_session_base.cc
@@ -4,10 +4,11 @@ #include "net/third_party/quiche/src/quic/qbone/qbone_session_base.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/quic_data_reader.h" #include "net/third_party/quiche/src/quic/core/quic_types.h" #include "net/third_party/quiche/src/quic/platform/api/quic_exported_stats.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/qbone/qbone_constants.h" namespace quic {
diff --git a/quic/qbone/qbone_session_test.cc b/quic/qbone/qbone_session_test.cc index b58f39e..83ee087 100644 --- a/quic/qbone/qbone_session_test.cc +++ b/quic/qbone/qbone_session_test.cc
@@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <utility> + #include "net/third_party/quiche/src/quic/core/proto/crypto_server_config_proto.h" #include "net/third_party/quiche/src/quic/core/quic_alarm_factory.h" #include "net/third_party/quiche/src/quic/core/quic_epoll_alarm_factory.h" #include "net/third_party/quiche/src/quic/platform/api/quic_expect_bug.h" #include "net/third_party/quiche/src/quic/platform/api/quic_port_utils.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test_loopback.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h"
diff --git a/quic/qbone/qbone_stream_test.cc b/quic/qbone/qbone_stream_test.cc index 344387f..bb9195b 100644 --- a/quic/qbone/qbone_stream_test.cc +++ b/quic/qbone/qbone_stream_test.cc
@@ -4,11 +4,12 @@ #include "net/third_party/quiche/src/quic/qbone/qbone_stream.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/crypto/quic_random.h" #include "net/third_party/quiche/src/quic/core/quic_session.h" #include "net/third_party/quiche/src/quic/core/quic_simple_buffer_allocator.h" #include "net/third_party/quiche/src/quic/core/quic_utils.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test_loopback.h" #include "net/third_party/quiche/src/quic/qbone/qbone_constants.h"
diff --git a/quic/quartc/quartc_crypto_helpers.cc b/quic/quartc/quartc_crypto_helpers.cc index 1d5dc86..edc6996 100644 --- a/quic/quartc/quartc_crypto_helpers.cc +++ b/quic/quartc/quartc_crypto_helpers.cc
@@ -3,6 +3,9 @@ // found in the LICENSE file. #include "net/third_party/quiche/src/quic/quartc/quartc_crypto_helpers.h" + +#include <utility> + #include "net/third_party/quiche/src/quic/core/quic_utils.h" namespace quic {
diff --git a/quic/quartc/quartc_dispatcher.cc b/quic/quartc/quartc_dispatcher.cc index a9d5510..b174519 100644 --- a/quic/quartc/quartc_dispatcher.cc +++ b/quic/quartc/quartc_dispatcher.cc
@@ -6,7 +6,6 @@ #include "net/third_party/quiche/src/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quic/core/quic_versions.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/quartc/quartc_factory.h" namespace quic {
diff --git a/quic/quartc/quartc_endpoint.cc b/quic/quartc/quartc_endpoint.cc index e6ac6be..5860454 100644 --- a/quic/quartc/quartc_endpoint.cc +++ b/quic/quartc/quartc_endpoint.cc
@@ -4,6 +4,8 @@ #include "net/third_party/quiche/src/quic/quartc/quartc_endpoint.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/quic_version_manager.h" #include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/quartc/quartc_connection_helper.h"
diff --git a/quic/quartc/quartc_endpoint_test.cc b/quic/quartc/quartc_endpoint_test.cc index 7eb45d0..165139c 100644 --- a/quic/quartc/quartc_endpoint_test.cc +++ b/quic/quartc/quartc_endpoint_test.cc
@@ -4,6 +4,8 @@ #include "net/third_party/quiche/src/quic/quartc/quartc_endpoint.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/quic_versions.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/quartc/quartc_crypto_helpers.h"
diff --git a/quic/quartc/quartc_factory.cc b/quic/quartc/quartc_factory.cc index 6053546..413c4f8 100644 --- a/quic/quartc/quartc_factory.cc +++ b/quic/quartc/quartc_factory.cc
@@ -4,12 +4,13 @@ #include "net/third_party/quiche/src/quic/quartc/quartc_factory.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/crypto/quic_random.h" #include "net/third_party/quiche/src/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quic/core/tls_client_handshaker.h" #include "net/third_party/quiche/src/quic/core/tls_server_handshaker.h" #include "net/third_party/quiche/src/quic/core/uber_received_packet_manager.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h" #include "net/third_party/quiche/src/quic/quartc/quartc_connection_helper.h" #include "net/third_party/quiche/src/quic/quartc/quartc_crypto_helpers.h"
diff --git a/quic/quartc/quartc_multiplexer.cc b/quic/quartc/quartc_multiplexer.cc index 36197c8..cb7d77c 100644 --- a/quic/quartc/quartc_multiplexer.cc +++ b/quic/quartc/quartc_multiplexer.cc
@@ -5,11 +5,11 @@ #include "net/third_party/quiche/src/quic/quartc/quartc_multiplexer.h" #include <cstdint> +#include <utility> #include "net/third_party/quiche/src/quic/core/quic_data_writer.h" #include "net/third_party/quiche/src/quic/platform/api/quic_mem_slice.h" #include "net/third_party/quiche/src/quic/platform/api/quic_mem_slice_span.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" namespace quic {
diff --git a/quic/quartc/quartc_multiplexer_test.cc b/quic/quartc/quartc_multiplexer_test.cc index 8490b64..a8f5352 100644 --- a/quic/quartc/quartc_multiplexer_test.cc +++ b/quic/quartc/quartc_multiplexer_test.cc
@@ -5,6 +5,7 @@ #include "net/third_party/quiche/src/quic/quartc/quartc_multiplexer.h" #include <memory> +#include <utility> #include "net/third_party/quiche/src/quic/core/frames/quic_connection_close_frame.h" #include "net/third_party/quiche/src/quic/core/quic_bandwidth.h" @@ -13,7 +14,6 @@ #include "net/third_party/quiche/src/quic/core/quic_types.h" #include "net/third_party/quiche/src/quic/platform/api/quic_containers.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test_mem_slice_vector.h"
diff --git a/quic/quartc/quartc_packet_writer.cc b/quic/quartc/quartc_packet_writer.cc index ad897b5..5ffb892 100644 --- a/quic/quartc/quartc_packet_writer.cc +++ b/quic/quartc/quartc_packet_writer.cc
@@ -4,6 +4,8 @@ #include "net/third_party/quiche/src/quic/quartc/quartc_packet_writer.h" +#include <utility> + namespace quic { std::unique_ptr<PerPacketOptions> QuartcPerPacketOptions::Clone() const {
diff --git a/quic/quartc/quartc_session.cc b/quic/quartc/quartc_session.cc index a3bff24..0868d72 100644 --- a/quic/quartc/quartc_session.cc +++ b/quic/quartc/quartc_session.cc
@@ -4,11 +4,12 @@ #include "net/third_party/quiche/src/quic/quartc/quartc_session.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quic/core/tls_client_handshaker.h" #include "net/third_party/quiche/src/quic/core/tls_server_handshaker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_mem_slice_storage.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/quartc/quartc_crypto_helpers.h" namespace quic {
diff --git a/quic/quartc/quartc_session_test.cc b/quic/quartc/quartc_session_test.cc index d314f8c..6ed8ec5 100644 --- a/quic/quartc/quartc_session_test.cc +++ b/quic/quartc/quartc_session_test.cc
@@ -4,12 +4,13 @@ #include "net/third_party/quiche/src/quic/quartc/quartc_session.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/quic_simple_buffer_allocator.h" #include "net/third_party/quiche/src/quic/core/quic_types.h" #include "net/third_party/quiche/src/quic/core/tls_client_handshaker.h" #include "net/third_party/quiche/src/quic/core/tls_server_handshaker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_clock.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test_mem_slice_vector.h"
diff --git a/quic/quartc/quartc_stream.cc b/quic/quartc/quartc_stream.cc index 7ec18a8..46f89db 100644 --- a/quic/quartc/quartc_stream.cc +++ b/quic/quartc/quartc_stream.cc
@@ -13,7 +13,6 @@ #include "net/third_party/quiche/src/quic/core/quic_stream_sequencer.h" #include "net/third_party/quiche/src/quic/core/quic_stream_sequencer_buffer.h" #include "net/third_party/quiche/src/quic/core/quic_types.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_reference_counted.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h"
diff --git a/quic/quartc/quartc_stream_test.cc b/quic/quartc/quartc_stream_test.cc index 52314fa..c8a68fc 100644 --- a/quic/quartc/quartc_stream_test.cc +++ b/quic/quartc/quartc_stream_test.cc
@@ -30,7 +30,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_endian.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_ip_address.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test_mem_slice_vector.h"
diff --git a/quic/quartc/simulated_packet_transport.cc b/quic/quartc/simulated_packet_transport.cc index cb4f97a..05f71c4 100644 --- a/quic/quartc/simulated_packet_transport.cc +++ b/quic/quartc/simulated_packet_transport.cc
@@ -3,6 +3,9 @@ // found in the LICENSE file. #include "net/third_party/quiche/src/quic/quartc/simulated_packet_transport.h" + +#include <utility> + #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" namespace quic {
diff --git a/quic/quartc/test/bidi_test_runner.cc b/quic/quartc/test/bidi_test_runner.cc index f4d7489..4608c3c 100644 --- a/quic/quartc/test/bidi_test_runner.cc +++ b/quic/quartc/test/bidi_test_runner.cc
@@ -4,6 +4,8 @@ #include "net/third_party/quiche/src/quic/quartc/test/bidi_test_runner.h" +#include <utility> + #include "net/third_party/quiche/src/quic/quartc/test/quartc_peer.h" namespace quic {
diff --git a/quic/quartc/test/quartc_bidi_test.cc b/quic/quartc/test/quartc_bidi_test.cc index 3581881..bb823c6 100644 --- a/quic/quartc/test/quartc_bidi_test.cc +++ b/quic/quartc/test/quartc_bidi_test.cc
@@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <utility> + #include "net/third_party/quiche/src/quic/core/quic_bandwidth.h" #include "net/third_party/quiche/src/quic/core/quic_time.h" #include "net/third_party/quiche/src/quic/core/quic_types.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/quartc/simulated_packet_transport.h"
diff --git a/quic/quartc/test/quartc_competing_endpoint.cc b/quic/quartc/test/quartc_competing_endpoint.cc index e729ad4..f82f47e 100644 --- a/quic/quartc/test/quartc_competing_endpoint.cc +++ b/quic/quartc/test/quartc_competing_endpoint.cc
@@ -4,6 +4,8 @@ #include "net/third_party/quiche/src/quic/quartc/test/quartc_competing_endpoint.h" +#include <utility> + #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" namespace quic {
diff --git a/quic/quartc/test/quartc_data_source_test.cc b/quic/quartc/test/quartc_data_source_test.cc index af95091..62038c6 100644 --- a/quic/quartc/test/quartc_data_source_test.cc +++ b/quic/quartc/test/quartc_data_source_test.cc
@@ -4,6 +4,7 @@ #include "net/third_party/quiche/src/quic/quartc/test/quartc_data_source.h" +#include <utility> #include <vector> #include "net/third_party/quiche/src/quic/platform/api/quic_test.h"
diff --git a/quic/quartc/test/quartc_peer.cc b/quic/quartc/test/quartc_peer.cc index 42eeea1..9c2748d 100644 --- a/quic/quartc/test/quartc_peer.cc +++ b/quic/quartc/test/quartc_peer.cc
@@ -4,6 +4,8 @@ #include "net/third_party/quiche/src/quic/quartc/test/quartc_peer.h" +#include <utility> + #include "net/third_party/quiche/src/quic/platform/api/quic_mem_slice_storage.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h"
diff --git a/quic/quartc/test/quartc_peer_test.cc b/quic/quartc/test/quartc_peer_test.cc index 53a746d..5603ace 100644 --- a/quic/quartc/test/quartc_peer_test.cc +++ b/quic/quartc/test/quartc_peer_test.cc
@@ -4,6 +4,8 @@ #include "net/third_party/quiche/src/quic/quartc/test/quartc_peer.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/quic_bandwidth.h" #include "net/third_party/quiche/src/quic/core/quic_constants.h" #include "net/third_party/quiche/src/quic/core/quic_time.h"
diff --git a/quic/quartc/test/quic_trace_interceptor.cc b/quic/quartc/test/quic_trace_interceptor.cc index e28fa2e..f2e685f 100644 --- a/quic/quartc/test/quic_trace_interceptor.cc +++ b/quic/quartc/test/quic_trace_interceptor.cc
@@ -5,9 +5,9 @@ #include "net/third_party/quiche/src/quic/quartc/test/quic_trace_interceptor.h" #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/quic_error_codes.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test_output.h" #include "net/third_party/quiche/src/quic/quartc/quartc_endpoint.h"
diff --git a/quic/quic_transport/quic_transport_client_session.cc b/quic/quic_transport/quic_transport_client_session.cc index b093026..5e2552f 100644 --- a/quic/quic_transport/quic_transport_client_session.cc +++ b/quic/quic_transport/quic_transport_client_session.cc
@@ -7,6 +7,7 @@ #include <cstdint> #include <limits> #include <memory> +#include <utility> #include "url/gurl.h" #include "net/third_party/quiche/src/quic/core/quic_crypto_client_stream.h"
diff --git a/quic/quic_transport/quic_transport_client_session_test.cc b/quic/quic_transport/quic_transport_client_session_test.cc index 41b6816..24e1071 100644 --- a/quic/quic_transport/quic_transport_client_session_test.cc +++ b/quic/quic_transport/quic_transport_client_session_test.cc
@@ -5,6 +5,7 @@ #include "net/third_party/quiche/src/quic/quic_transport/quic_transport_client_session.h" #include <memory> +#include <utility> #include "url/gurl.h" #include "net/third_party/quiche/src/quic/core/quic_data_writer.h"
diff --git a/quic/test_tools/crypto_test_utils.cc b/quic/test_tools/crypto_test_utils.cc index 7e9b882..45872d2 100644 --- a/quic/test_tools/crypto_test_utils.cc +++ b/quic/test_tools/crypto_test_utils.cc
@@ -6,6 +6,7 @@ #include <memory> #include <string> +#include <utility> #include "third_party/boringssl/src/include/openssl/bn.h" #include "third_party/boringssl/src/include/openssl/ec.h" @@ -28,7 +29,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_clock.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h"
diff --git a/quic/test_tools/crypto_test_utils_test.cc b/quic/test_tools/crypto_test_utils_test.cc index 3c9f18f..59a3947 100644 --- a/quic/test_tools/crypto_test_utils_test.cc +++ b/quic/test_tools/crypto_test_utils_test.cc
@@ -4,9 +4,10 @@ #include "net/third_party/quiche/src/quic/test_tools/crypto_test_utils.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/proto/crypto_server_config_proto.h" #include "net/third_party/quiche/src/quic/core/quic_utils.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h" #include "net/third_party/quiche/src/quic/test_tools/mock_clock.h"
diff --git a/quic/test_tools/fake_proof_source.cc b/quic/test_tools/fake_proof_source.cc index c47208f..784ced4 100644 --- a/quic/test_tools/fake_proof_source.cc +++ b/quic/test_tools/fake_proof_source.cc
@@ -4,8 +4,9 @@ #include "net/third_party/quiche/src/quic/test_tools/fake_proof_source.h" +#include <utility> + #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/test_tools/crypto_test_utils.h" namespace quic {
diff --git a/quic/test_tools/quic_test_server.cc b/quic/test_tools/quic_test_server.cc index 3eb4f64..26e50a8 100644 --- a/quic/test_tools/quic_test_server.cc +++ b/quic/test_tools/quic_test_server.cc
@@ -4,6 +4,8 @@ #include "net/third_party/quiche/src/quic/test_tools/quic_test_server.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/quic_epoll_alarm_factory.h" #include "net/third_party/quiche/src/quic/core/quic_epoll_connection_helper.h" #include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h"
diff --git a/quic/test_tools/quic_test_utils.cc b/quic/test_tools/quic_test_utils.cc index 89cf15d..ddf42ef 100644 --- a/quic/test_tools/quic_test_utils.cc +++ b/quic/test_tools/quic_test_utils.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include <cstdint> #include <memory> +#include <utility> #include "third_party/boringssl/src/include/openssl/chacha.h" #include "third_party/boringssl/src/include/openssl/sha.h" @@ -24,7 +25,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_endian.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/test_tools/crypto_test_utils.h" #include "net/third_party/quiche/src/quic/test_tools/quic_config_peer.h" #include "net/third_party/quiche/src/quic/test_tools/quic_connection_peer.h"
diff --git a/quic/test_tools/quic_test_utils.h b/quic/test_tools/quic_test_utils.h index 4246cfa..2fc1b4a 100644 --- a/quic/test_tools/quic_test_utils.h +++ b/quic/test_tools/quic_test_utils.h
@@ -23,7 +23,6 @@ #include "net/third_party/quiche/src/quic/core/quic_sent_packet_manager.h" #include "net/third_party/quiche/src/quic/core/quic_simple_buffer_allocator.h" #include "net/third_party/quiche/src/quic/platform/api/quic_mem_slice_storage.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/mock_clock.h"
diff --git a/quic/test_tools/simple_data_producer.cc b/quic/test_tools/simple_data_producer.cc index e9dab7b..ad8b2c3 100644 --- a/quic/test_tools/simple_data_producer.cc +++ b/quic/test_tools/simple_data_producer.cc
@@ -4,11 +4,12 @@ #include "net/third_party/quiche/src/quic/test_tools/simple_data_producer.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/quic_data_writer.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_map_util.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" namespace quic {
diff --git a/quic/test_tools/simple_quic_framer.cc b/quic/test_tools/simple_quic_framer.cc index 68e4878..be03aa1 100644 --- a/quic/test_tools/simple_quic_framer.cc +++ b/quic/test_tools/simple_quic_framer.cc
@@ -5,6 +5,7 @@ #include "net/third_party/quiche/src/quic/test_tools/simple_quic_framer.h" #include <memory> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/quic_decrypter.h" #include "net/third_party/quiche/src/quic/core/crypto/quic_encrypter.h"
diff --git a/quic/test_tools/simple_session_notifier_test.cc b/quic/test_tools/simple_session_notifier_test.cc index eea1608..93f11aa 100644 --- a/quic/test_tools/simple_session_notifier_test.cc +++ b/quic/test_tools/simple_session_notifier_test.cc
@@ -4,6 +4,8 @@ #include "net/third_party/quiche/src/quic/test_tools/simple_session_notifier.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/crypto/null_encrypter.h" #include "net/third_party/quiche/src/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h"
diff --git a/quic/test_tools/simulator/quic_endpoint.cc b/quic/test_tools/simulator/quic_endpoint.cc index 68c758f..bd01c43 100644 --- a/quic/test_tools/simulator/quic_endpoint.cc +++ b/quic/test_tools/simulator/quic_endpoint.cc
@@ -4,10 +4,11 @@ #include "net/third_party/quiche/src/quic/test_tools/simulator/quic_endpoint.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/crypto/crypto_handshake_message.h" #include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h" #include "net/third_party/quiche/src/quic/core/quic_data_writer.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test_output.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h"
diff --git a/quic/test_tools/simulator/quic_endpoint_test.cc b/quic/test_tools/simulator/quic_endpoint_test.cc index 11a00fa..772cd2e 100644 --- a/quic/test_tools/simulator/quic_endpoint_test.cc +++ b/quic/test_tools/simulator/quic_endpoint_test.cc
@@ -4,8 +4,9 @@ #include "net/third_party/quiche/src/quic/test_tools/simulator/quic_endpoint.h" +#include <utility> + #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/quic_connection_peer.h" #include "net/third_party/quiche/src/quic/test_tools/quic_test_utils.h"
diff --git a/quic/test_tools/simulator/simulator_test.cc b/quic/test_tools/simulator/simulator_test.cc index 369825d..06ef4b2 100644 --- a/quic/test_tools/simulator/simulator_test.cc +++ b/quic/test_tools/simulator/simulator_test.cc
@@ -4,9 +4,10 @@ #include "net/third_party/quiche/src/quic/test_tools/simulator/simulator.h" +#include <utility> + #include "net/third_party/quiche/src/quic/platform/api/quic_containers.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/quic_test_utils.h" #include "net/third_party/quiche/src/quic/test_tools/simulator/alarm_factory.h"
diff --git a/quic/test_tools/simulator/switch.cc b/quic/test_tools/simulator/switch.cc index 9247490..e9b57ec 100644 --- a/quic/test_tools/simulator/switch.cc +++ b/quic/test_tools/simulator/switch.cc
@@ -3,8 +3,8 @@ // found in the LICENSE file. #include <cinttypes> +#include <utility> -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" #include "net/third_party/quiche/src/quic/test_tools/simulator/switch.h"
diff --git a/quic/tools/quic_client.cc b/quic/tools/quic_client.cc index 01964f6..cccb7ba 100644 --- a/quic/tools/quic_client.cc +++ b/quic/tools/quic_client.cc
@@ -12,6 +12,8 @@ #include <sys/socket.h> #include <sys/types.h> +#include <utility> + #include "net/third_party/quiche/src/quic/core/crypto/quic_random.h" #include "net/third_party/quiche/src/quic/core/http/spdy_utils.h" #include "net/third_party/quiche/src/quic/core/quic_connection.h"
diff --git a/quic/tools/quic_client_epoll_network_helper.cc b/quic/tools/quic_client_epoll_network_helper.cc index d16a128..2f6d47d 100644 --- a/quic/tools/quic_client_epoll_network_helper.cc +++ b/quic/tools/quic_client_epoll_network_helper.cc
@@ -21,7 +21,6 @@ #include "net/third_party/quiche/src/quic/core/quic_server_id.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_system_event_loop.h" #include "net/quic/platform/impl/quic_socket_utils.h"
diff --git a/quic/tools/quic_client_interop_test_bin.cc b/quic/tools/quic_client_interop_test_bin.cc index a99f66a..87940a9 100644 --- a/quic/tools/quic_client_interop_test_bin.cc +++ b/quic/tools/quic_client_interop_test_bin.cc
@@ -5,6 +5,7 @@ #include <iostream> #include <memory> #include <string> +#include <utility> #include "net/third_party/quiche/src/quic/core/quic_versions.h" #include "net/third_party/quiche/src/quic/platform/api/quic_epoll.h"
diff --git a/quic/tools/quic_client_test.cc b/quic/tools/quic_client_test.cc index 6b99d02..e460de4 100644 --- a/quic/tools/quic_client_test.cc +++ b/quic/tools/quic_client_test.cc
@@ -8,6 +8,7 @@ #include <sys/types.h> #include <memory> +#include <utility> #include "net/third_party/quiche/src/quic/platform/api/quic_epoll.h" #include "net/third_party/quiche/src/quic/platform/api/quic_port_utils.h"
diff --git a/quic/tools/quic_epoll_client_factory.cc b/quic/tools/quic_epoll_client_factory.cc index bad090d..113958f 100644 --- a/quic/tools/quic_epoll_client_factory.cc +++ b/quic/tools/quic_epoll_client_factory.cc
@@ -8,6 +8,8 @@ #include <sys/socket.h> #include <sys/types.h> +#include <utility> + #include "net/third_party/quiche/src/quic/core/quic_server_id.h" #include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h" #include "net/third_party/quiche/src/quic/tools/quic_client.h"
diff --git a/quic/tools/quic_epoll_server_factory.cc b/quic/tools/quic_epoll_server_factory.cc index baa1392..d216cd1 100644 --- a/quic/tools/quic_epoll_server_factory.cc +++ b/quic/tools/quic_epoll_server_factory.cc
@@ -4,6 +4,8 @@ #include "net/third_party/quiche/src/quic/tools/quic_epoll_server_factory.h" +#include <utility> + #include "net/third_party/quiche/src/quic/tools/quic_server.h" namespace quic {
diff --git a/quic/tools/quic_memory_cache_backend.cc b/quic/tools/quic_memory_cache_backend.cc index aa0d273..fb3dd1f 100644 --- a/quic/tools/quic_memory_cache_backend.cc +++ b/quic/tools/quic_memory_cache_backend.cc
@@ -11,7 +11,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_file_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" #include "net/third_party/quiche/src/quic/platform/api/quic_map_util.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h" using spdy::kV3LowestPriority;
diff --git a/quic/tools/quic_simple_client_session.cc b/quic/tools/quic_simple_client_session.cc index f39d8fa..c62786f 100644 --- a/quic/tools/quic_simple_client_session.cc +++ b/quic/tools/quic_simple_client_session.cc
@@ -4,7 +4,7 @@ #include "net/third_party/quiche/src/quic/tools/quic_simple_client_session.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" +#include <utility> namespace quic {
diff --git a/quic/tools/quic_simple_server_session_test.cc b/quic/tools/quic_simple_server_session_test.cc index c5ce7a3..be2d0d6 100644 --- a/quic/tools/quic_simple_server_session_test.cc +++ b/quic/tools/quic_simple_server_session_test.cc
@@ -6,6 +6,7 @@ #include <algorithm> #include <memory> +#include <utility> #include "net/third_party/quiche/src/quic/core/crypto/quic_crypto_server_config.h" #include "net/third_party/quiche/src/quic/core/crypto/quic_random.h" @@ -16,7 +17,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_containers.h" #include "net/third_party/quiche/src/quic/platform/api/quic_expect_bug.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h"
diff --git a/quic/tools/quic_spdy_client_base.cc b/quic/tools/quic_spdy_client_base.cc index 492091c..6c16695 100644 --- a/quic/tools/quic_spdy_client_base.cc +++ b/quic/tools/quic_spdy_client_base.cc
@@ -4,12 +4,13 @@ #include "net/third_party/quiche/src/quic/tools/quic_spdy_client_base.h" +#include <utility> + #include "net/third_party/quiche/src/quic/core/crypto/quic_random.h" #include "net/third_party/quiche/src/quic/core/http/spdy_utils.h" #include "net/third_party/quiche/src/quic/core/quic_server_id.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h" using spdy::SpdyHeaderBlock;
diff --git a/quic/tools/quic_toy_client.cc b/quic/tools/quic_toy_client.cc index 4c4a1f5..a9a3886 100644 --- a/quic/tools/quic_toy_client.cc +++ b/quic/tools/quic_toy_client.cc
@@ -45,6 +45,7 @@ #include <iostream> #include <memory> #include <string> +#include <utility> #include <vector> #include "net/third_party/quiche/src/quic/core/quic_packets.h" @@ -52,7 +53,6 @@ #include "net/third_party/quiche/src/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quic/core/quic_versions.h" #include "net/third_party/quiche/src/quic/platform/api/quic_default_proof_providers.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h" #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h"
diff --git a/quic/tools/quic_toy_server.cc b/quic/tools/quic_toy_server.cc index c572c7a..0b0cd3d 100644 --- a/quic/tools/quic_toy_server.cc +++ b/quic/tools/quic_toy_server.cc
@@ -4,12 +4,12 @@ #include "net/third_party/quiche/src/quic/tools/quic_toy_server.h" +#include <utility> #include <vector> #include "net/third_party/quiche/src/quic/core/quic_versions.h" #include "net/third_party/quiche/src/quic/platform/api/quic_default_proof_providers.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" #include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h" #include "net/third_party/quiche/src/quic/tools/quic_memory_cache_backend.h"
diff --git a/spdy/core/hpack/hpack_encoder.cc b/spdy/core/hpack/hpack_encoder.cc index f4f427c..af76c3b 100644 --- a/spdy/core/hpack/hpack_encoder.cc +++ b/spdy/core/hpack/hpack_encoder.cc
@@ -6,6 +6,7 @@ #include <algorithm> #include <limits> +#include <utility> #include "net/third_party/quiche/src/spdy/core/hpack/hpack_constants.h" #include "net/third_party/quiche/src/spdy/core/hpack/hpack_header_table.h" @@ -13,7 +14,6 @@ #include "net/third_party/quiche/src/spdy/core/hpack/hpack_output_stream.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_estimate_memory_usage.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_ptr_util.h" namespace spdy { @@ -322,8 +322,8 @@ : GatherRepresentation(header, ®ular_headers_); } } - header_it_ = - SpdyMakeUnique<RepresentationIterator>(pseudo_headers_, regular_headers_); + header_it_ = std::make_unique<RepresentationIterator>(pseudo_headers_, + regular_headers_); encoder_->MaybeEmitTableSize(); } @@ -360,7 +360,7 @@ std::unique_ptr<HpackEncoder::ProgressiveEncoder> HpackEncoder::EncodeHeaderSet( const SpdyHeaderBlock& header_set) { - return SpdyMakeUnique<Encoderator>(header_set, this); + return std::make_unique<Encoderator>(header_set, this); } } // namespace spdy
diff --git a/spdy/core/http2_frame_decoder_adapter.cc b/spdy/core/http2_frame_decoder_adapter.cc index d5b20f0..bc2263e 100644 --- a/spdy/core/http2_frame_decoder_adapter.cc +++ b/spdy/core/http2_frame_decoder_adapter.cc
@@ -32,7 +32,6 @@ #include "net/third_party/quiche/src/spdy/platform/api/spdy_estimate_memory_usage.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_flags.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_ptr_util.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_string_utils.h" using ::spdy::ExtensionVisitorInterface; @@ -48,7 +47,6 @@ using ::spdy::SpdyFrameType; using ::spdy::SpdyHeadersHandlerInterface; using ::spdy::SpdyKnownSettingsId; -using ::spdy::SpdyMakeUnique; using ::spdy::SpdySettingsId; namespace http2 { @@ -811,7 +809,7 @@ CorruptFrameHeader(&frame_header_); CorruptFrameHeader(&hpack_first_frame_header_); - frame_decoder_ = SpdyMakeUnique<Http2FrameDecoder>(this); + frame_decoder_ = std::make_unique<Http2FrameDecoder>(this); hpack_decoder_ = nullptr; } @@ -950,7 +948,7 @@ HpackDecoderAdapter* Http2DecoderAdapter::GetHpackDecoder() { if (hpack_decoder_ == nullptr) { - hpack_decoder_ = SpdyMakeUnique<HpackDecoderAdapter>(); + hpack_decoder_ = std::make_unique<HpackDecoderAdapter>(); } return hpack_decoder_.get(); }
diff --git a/spdy/core/http2_priority_write_scheduler.h b/spdy/core/http2_priority_write_scheduler.h index 1255839..4a2b4f0 100644 --- a/spdy/core/http2_priority_write_scheduler.h +++ b/spdy/core/http2_priority_write_scheduler.h
@@ -24,7 +24,6 @@ #include "net/third_party/quiche/src/spdy/platform/api/spdy_containers.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_map_util.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_ptr_util.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_string_utils.h" namespace spdy { @@ -198,7 +197,7 @@ template <typename StreamIdType> Http2PriorityWriteScheduler<StreamIdType>::Http2PriorityWriteScheduler() { - auto root_stream_info = SpdyMakeUnique<StreamInfo>(); + auto root_stream_info = std::make_unique<StreamInfo>(); root_stream_info_ = root_stream_info.get(); root_stream_info->id = kHttp2RootStreamId; root_stream_info->weight = kHttp2DefaultStreamWeight; @@ -238,7 +237,7 @@ parent = root_stream_info_; } - auto new_stream_info = SpdyMakeUnique<StreamInfo>(); + auto new_stream_info = std::make_unique<StreamInfo>(); StreamInfo* new_stream_info_ptr = new_stream_info.get(); new_stream_info_ptr->id = stream_id; new_stream_info_ptr->weight = precedence.weight();
diff --git a/spdy/core/mock_spdy_framer_visitor.h b/spdy/core/mock_spdy_framer_visitor.h index 9dd709c..8600f5c 100644 --- a/spdy/core/mock_spdy_framer_visitor.h +++ b/spdy/core/mock_spdy_framer_visitor.h
@@ -7,10 +7,10 @@ #include <cstdint> #include <memory> +#include <utility> #include "net/third_party/quiche/src/spdy/core/http2_frame_decoder_adapter.h" #include "net/third_party/quiche/src/spdy/core/spdy_test_utils.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_ptr_util.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_string_piece.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" @@ -84,7 +84,7 @@ SpdyHeadersHandlerInterface* ReturnTestHeadersHandler( SpdyStreamId /* stream_id */) { if (headers_handler_ == nullptr) { - headers_handler_ = SpdyMakeUnique<TestHeadersHandler>(); + headers_handler_ = std::make_unique<TestHeadersHandler>(); } return headers_handler_.get(); }
diff --git a/spdy/core/spdy_deframer_visitor.cc b/spdy/core/spdy_deframer_visitor.cc index 0ea2020..e49b755 100644 --- a/spdy/core/spdy_deframer_visitor.cc +++ b/spdy/core/spdy_deframer_visitor.cc
@@ -19,7 +19,6 @@ #include "net/third_party/quiche/src/spdy/core/spdy_test_utils.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_flags.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_ptr_util.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_string_piece.h" using ::testing::AssertionFailure; @@ -240,13 +239,13 @@ // static std::unique_ptr<SpdyTestDeframer> SpdyTestDeframer::CreateConverter( std::unique_ptr<SpdyDeframerVisitorInterface> listener) { - return SpdyMakeUnique<SpdyTestDeframerImpl>(std::move(listener)); + return std::make_unique<SpdyTestDeframerImpl>(std::move(listener)); } void SpdyTestDeframerImpl::AtDataEnd() { SPDY_DVLOG(1) << "AtDataEnd"; CHECK_EQ(data_len_, padding_len_ + data_->size()); - auto ptr = SpdyMakeUnique<SpdyDataIR>(stream_id_, std::move(*data_)); + auto ptr = std::make_unique<SpdyDataIR>(stream_id_, std::move(*data_)); CHECK_EQ(0u, data_->size()); data_.reset(); @@ -270,7 +269,7 @@ if (HTTP2_DIE_IF_NULL(goaway_description_)->empty()) { listener_->OnGoAway(std::move(goaway_ir_)); } else { - listener_->OnGoAway(SpdyMakeUnique<SpdyGoAwayIR>( + listener_->OnGoAway(std::make_unique<SpdyGoAwayIR>( goaway_ir_->last_good_stream_id(), goaway_ir_->error_code(), std::move(*goaway_description_))); CHECK_EQ(0u, goaway_description_->size()); @@ -416,7 +415,7 @@ CHECK_EQ(frame_type_, UNSET) << " frame_type_=" << Http2FrameTypeToString(frame_type_); CHECK_GT(stream_id, 0u); - auto ptr = SpdyMakeUnique<SpdyAltSvcIR>(stream_id); + auto ptr = std::make_unique<SpdyAltSvcIR>(stream_id); ptr->set_origin(std::string(origin)); for (auto& altsvc : altsvc_vector) { ptr->add_altsvc(altsvc); @@ -456,7 +455,7 @@ stream_id_ = stream_id; fin_ = fin; data_len_ = length; - data_ = SpdyMakeUnique<std::string>(); + data_ = std::make_unique<std::string>(); } // The SpdyFramer will not process any more data at this point. @@ -481,8 +480,8 @@ << " frame_type_=" << Http2FrameTypeToString(frame_type_); frame_type_ = GOAWAY; goaway_ir_ = - SpdyMakeUnique<SpdyGoAwayIR>(last_good_stream_id, error_code, ""); - goaway_description_ = SpdyMakeUnique<std::string>(); + std::make_unique<SpdyGoAwayIR>(last_good_stream_id, error_code, ""); + goaway_description_ = std::make_unique<std::string>(); } // If len==0 then we've reached the end of the GOAWAY frame. @@ -529,9 +528,9 @@ fin_ = fin; end_ = end; - headers_ = SpdyMakeUnique<StringPairVector>(); - headers_handler_ = SpdyMakeUnique<TestHeadersHandler>(); - headers_ir_ = SpdyMakeUnique<SpdyHeadersIR>(stream_id); + headers_ = std::make_unique<StringPairVector>(); + headers_handler_ = std::make_unique<TestHeadersHandler>(); + headers_ir_ = std::make_unique<SpdyHeadersIR>(stream_id); headers_ir_->set_fin(fin); if (has_priority) { headers_ir_->set_has_priority(true); @@ -551,7 +550,7 @@ << " is_ack: " << (is_ack ? "true" : "false"); CHECK_EQ(frame_type_, UNSET) << " frame_type_=" << Http2FrameTypeToString(frame_type_); - auto ptr = SpdyMakeUnique<SpdyPingIR>(unique_id); + auto ptr = std::make_unique<SpdyPingIR>(unique_id); if (is_ack) { ptr->set_is_ack(is_ack); listener_->OnPingAck(std::move(ptr)); @@ -569,7 +568,7 @@ << " frame_type_=" << Http2FrameTypeToString(frame_type_); CHECK_GT(stream_id, 0u); - listener_->OnPriority(SpdyMakeUnique<SpdyPriorityIR>( + listener_->OnPriority(std::make_unique<SpdyPriorityIR>( stream_id, parent_stream_id, weight, exclusive)); } @@ -585,10 +584,10 @@ stream_id_ = stream_id; end_ = end; - headers_ = SpdyMakeUnique<StringPairVector>(); - headers_handler_ = SpdyMakeUnique<TestHeadersHandler>(); + headers_ = std::make_unique<StringPairVector>(); + headers_handler_ = std::make_unique<TestHeadersHandler>(); push_promise_ir_ = - SpdyMakeUnique<SpdyPushPromiseIR>(stream_id, promised_stream_id); + std::make_unique<SpdyPushPromiseIR>(stream_id, promised_stream_id); } // Closes the specified stream. After this the sender may still send PRIORITY @@ -602,7 +601,7 @@ CHECK_GT(stream_id, 0u); listener_->OnRstStream( - SpdyMakeUnique<SpdyRstStreamIR>(stream_id, error_code)); + std::make_unique<SpdyRstStreamIR>(stream_id, error_code)); } // Called for an individual setting. There is no negotiation; the sender is @@ -631,15 +630,15 @@ frame_type_ = SETTINGS; ack_ = false; - settings_ = SpdyMakeUnique<SettingVector>(); - settings_ir_ = SpdyMakeUnique<SpdySettingsIR>(); + settings_ = std::make_unique<SettingVector>(); + settings_ir_ = std::make_unique<SpdySettingsIR>(); } void SpdyTestDeframerImpl::OnSettingsAck() { SPDY_DVLOG(1) << "OnSettingsAck"; CHECK_EQ(frame_type_, UNSET) << " frame_type_=" << Http2FrameTypeToString(frame_type_); - auto ptr = SpdyMakeUnique<SpdySettingsIR>(); + auto ptr = std::make_unique<SpdySettingsIR>(); ptr->set_is_ack(true); listener_->OnSettingsAck(std::move(ptr)); } @@ -727,7 +726,7 @@ CHECK_NE(0, delta_window_size); listener_->OnWindowUpdate( - SpdyMakeUnique<SpdyWindowUpdateIR>(stream_id, delta_window_size)); + std::make_unique<SpdyWindowUpdateIR>(stream_id, delta_window_size)); } // Return true to indicate that the stream_id is valid; if not valid then @@ -784,7 +783,7 @@ std::unique_ptr<SpdyDeframerVisitorInterface> wrapped) : wrapped_(std::move(wrapped)) { if (!wrapped_) { - wrapped_ = SpdyMakeUnique<SpdyDeframerVisitorInterface>(); + wrapped_ = std::make_unique<SpdyDeframerVisitorInterface>(); } } ~LoggingSpdyDeframerDelegate() override = default; @@ -875,7 +874,7 @@ std::unique_ptr<SpdyDeframerVisitorInterface> SpdyDeframerVisitorInterface::LogBeforeVisiting( std::unique_ptr<SpdyDeframerVisitorInterface> wrapped_listener) { - return SpdyMakeUnique<LoggingSpdyDeframerDelegate>( + return std::make_unique<LoggingSpdyDeframerDelegate>( std::move(wrapped_listener)); }
diff --git a/spdy/core/spdy_deframer_visitor.h b/spdy/core/spdy_deframer_visitor.h index f95d513..f36daac 100644 --- a/spdy/core/spdy_deframer_visitor.h +++ b/spdy/core/spdy_deframer_visitor.h
@@ -32,7 +32,7 @@ // // Create your visitor, a subclass of SpdyDeframerVisitorInterface. // // For example, using DeframerCallbackCollector to collect frames: // std::vector<CollectedFrame> collected_frames; -// auto your_visitor = SpdyMakeUnique<DeframerCallbackCollector>( +// auto your_visitor = std::make_unique<DeframerCallbackCollector>( // &collected_frames); // // // Transfer ownership of your visitor to the converter, which ensures that
diff --git a/spdy/core/spdy_deframer_visitor_test.cc b/spdy/core/spdy_deframer_visitor_test.cc index 82a85be..4beeb72 100644 --- a/spdy/core/spdy_deframer_visitor_test.cc +++ b/spdy/core/spdy_deframer_visitor_test.cc
@@ -19,7 +19,6 @@ #include "net/third_party/quiche/src/spdy/core/spdy_protocol_test_utils.h" #include "net/third_party/quiche/src/spdy/core/spdy_test_utils.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_ptr_util.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" namespace spdy { @@ -31,7 +30,7 @@ SpdyDeframerVisitorTest() : encoder_(SpdyFramer::ENABLE_COMPRESSION) { decoder_.set_process_single_input_frame(true); auto collector = - SpdyMakeUnique<DeframerCallbackCollector>(&collected_frames_); + std::make_unique<DeframerCallbackCollector>(&collected_frames_); auto log_and_collect = SpdyDeframerVisitorInterface::LogBeforeVisiting(std::move(collector)); deframer_ = SpdyTestDeframer::CreateConverter(std::move(log_and_collect));
diff --git a/spdy/core/spdy_framer.cc b/spdy/core/spdy_framer.cc index 59f7c3b..cf2201c 100644 --- a/spdy/core/spdy_framer.cc +++ b/spdy/core/spdy_framer.cc
@@ -9,6 +9,7 @@ #include <iterator> #include <list> #include <new> +#include <utility> #include "net/third_party/quiche/src/http2/platform/api/http2_macros.h" #include "net/third_party/quiche/src/spdy/core/hpack/hpack_constants.h" @@ -301,7 +302,7 @@ const size_t size_without_block = is_first_frame_ ? GetFrameSizeSansBlock() : kContinuationFrameMinimumSize; - auto encoding = SpdyMakeUnique<std::string>(); + auto encoding = std::make_unique<std::string>(); encoder_->Next(kHttp2MaxControlFrameSendSize - size_without_block, encoding.get()); has_next_frame_ = encoder_->HasNext(); @@ -412,12 +413,12 @@ std::unique_ptr<const SpdyFrameIR> frame_ir) { switch (frame_ir->frame_type()) { case SpdyFrameType::HEADERS: { - return SpdyMakeUnique<SpdyHeaderFrameIterator>( + return std::make_unique<SpdyHeaderFrameIterator>( framer, SpdyWrapUnique(static_cast<const SpdyHeadersIR*>(frame_ir.release()))); } case SpdyFrameType::PUSH_PROMISE: { - return SpdyMakeUnique<SpdyPushPromiseFrameIterator>( + return std::make_unique<SpdyPushPromiseFrameIterator>( framer, SpdyWrapUnique( static_cast<const SpdyPushPromiseIR*>(frame_ir.release()))); } @@ -426,8 +427,8 @@ HTTP2_FALLTHROUGH; } default: { - return SpdyMakeUnique<SpdyControlFrameIterator>(framer, - std::move(frame_ir)); + return std::make_unique<SpdyControlFrameIterator>(framer, + std::move(frame_ir)); } } } @@ -1268,7 +1269,7 @@ HpackEncoder* SpdyFramer::GetHpackEncoder() { if (hpack_encoder_ == nullptr) { - hpack_encoder_ = SpdyMakeUnique<HpackEncoder>(ObtainHpackHuffmanTable()); + hpack_encoder_ = std::make_unique<HpackEncoder>(ObtainHpackHuffmanTable()); if (!compression_enabled()) { hpack_encoder_->DisableCompression(); }
diff --git a/spdy/core/spdy_framer_test.cc b/spdy/core/spdy_framer_test.cc index a424adb..63a16f4 100644 --- a/spdy/core/spdy_framer_test.cc +++ b/spdy/core/spdy_framer_test.cc
@@ -10,6 +10,7 @@ #include <cstdint> #include <limits> #include <tuple> +#include <utility> #include <vector> #include "net/third_party/quiche/src/spdy/core/array_output_buffer.h" @@ -23,7 +24,6 @@ #include "net/third_party/quiche/src/spdy/platform/api/spdy_arraysize.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_flags.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_ptr_util.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_string_utils.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" @@ -86,7 +86,7 @@ // header serialization path. static std::unique_ptr<SpdyHeadersIR> CloneSpdyHeadersIR( const SpdyHeadersIR& headers) { - auto new_headers = SpdyMakeUnique<SpdyHeadersIR>( + auto new_headers = std::make_unique<SpdyHeadersIR>( headers.stream_id(), headers.header_block().Clone()); new_headers->set_fin(headers.fin()); new_headers->set_has_priority(headers.has_priority()); @@ -155,7 +155,7 @@ static std::unique_ptr<SpdyPushPromiseIR> CloneSpdyPushPromiseIR( const SpdyPushPromiseIR& push_promise) { - auto new_push_promise = SpdyMakeUnique<SpdyPushPromiseIR>( + auto new_push_promise = std::make_unique<SpdyPushPromiseIR>( push_promise.stream_id(), push_promise.promised_stream_id(), push_promise.header_block().Clone()); new_push_promise->set_fin(push_promise.fin()); @@ -315,7 +315,7 @@ SpdyHeadersHandlerInterface* OnHeaderFrameStart( SpdyStreamId /*stream_id*/) override { if (headers_handler_ == nullptr) { - headers_handler_ = SpdyMakeUnique<TestHeadersHandler>(); + headers_handler_ = std::make_unique<TestHeadersHandler>(); } return headers_handler_.get(); } @@ -408,7 +408,7 @@ altsvc_vector) override { SPDY_VLOG(1) << "OnAltSvc(" << stream_id << ", \"" << origin << "\", altsvc_vector)"; - test_altsvc_ir_ = SpdyMakeUnique<SpdyAltSvcIR>(stream_id); + test_altsvc_ir_ = std::make_unique<SpdyAltSvcIR>(stream_id); if (origin.length() > 0) { test_altsvc_ir_->set_origin(std::string(origin)); } @@ -1033,7 +1033,7 @@ SpdyContinuationIR continuation(/* stream_id = */ 0); auto some_nonsense_encoding = - SpdyMakeUnique<std::string>("some nonsense encoding"); + std::make_unique<std::string>("some nonsense encoding"); continuation.take_encoding(std::move(some_nonsense_encoding)); continuation.set_end_headers(true); SpdySerializedFrame frame(framer_.SerializeContinuation(continuation)); @@ -2307,7 +2307,7 @@ SpdyHeaderBlock header_block; header_block["bar"] = "foo"; header_block["foo"] = "bar"; - auto buffer = SpdyMakeUnique<std::string>(); + auto buffer = std::make_unique<std::string>(); HpackEncoder encoder(ObtainHpackHuffmanTable()); encoder.DisableCompression(); encoder.EncodeHeaderSet(header_block, buffer.get()); @@ -2635,7 +2635,7 @@ TEST_P(SpdyFramerTest, MultipleContinuationFramesWithIterator) { SpdyFramer framer(SpdyFramer::DISABLE_COMPRESSION); - auto headers = SpdyMakeUnique<SpdyHeadersIR>(/* stream_id = */ 1); + auto headers = std::make_unique<SpdyHeadersIR>(/* stream_id = */ 1); headers->set_padding_len(256); // Exact payload length will change with HPACK, but this should be long @@ -2699,8 +2699,8 @@ TEST_P(SpdyFramerTest, PushPromiseFramesWithIterator) { SpdyFramer framer(SpdyFramer::DISABLE_COMPRESSION); auto push_promise = - SpdyMakeUnique<SpdyPushPromiseIR>(/* stream_id = */ 1, - /* promised_stream_id = */ 2); + std::make_unique<SpdyPushPromiseIR>(/* stream_id = */ 1, + /* promised_stream_id = */ 2); push_promise->set_padding_len(256); // Exact payload length will change with HPACK, but this should be long @@ -2782,12 +2782,12 @@ }; TEST_F(SpdyControlFrameIteratorTest, RstStreamFrameWithIterator) { - auto ir = SpdyMakeUnique<SpdyRstStreamIR>(0, ERROR_CODE_PROTOCOL_ERROR); + auto ir = std::make_unique<SpdyRstStreamIR>(0, ERROR_CODE_PROTOCOL_ERROR); RunTest(std::move(ir)); } TEST_F(SpdyControlFrameIteratorTest, SettingsFrameWithIterator) { - auto ir = SpdyMakeUnique<SpdySettingsIR>(); + auto ir = std::make_unique<SpdySettingsIR>(); uint32_t kValue = 0x0a0b0c0d; SpdyKnownSettingsId kId = SETTINGS_INITIAL_WINDOW_SIZE; ir->AddSetting(kId, kValue); @@ -2796,22 +2796,22 @@ TEST_F(SpdyControlFrameIteratorTest, PingFrameWithIterator) { const SpdyPingId kPingId = 0x123456789abcdeffULL; - auto ir = SpdyMakeUnique<SpdyPingIR>(kPingId); + auto ir = std::make_unique<SpdyPingIR>(kPingId); RunTest(std::move(ir)); } TEST_F(SpdyControlFrameIteratorTest, GoAwayFrameWithIterator) { - auto ir = SpdyMakeUnique<SpdyGoAwayIR>(0, ERROR_CODE_NO_ERROR, "GA"); + auto ir = std::make_unique<SpdyGoAwayIR>(0, ERROR_CODE_NO_ERROR, "GA"); RunTest(std::move(ir)); } TEST_F(SpdyControlFrameIteratorTest, WindowUpdateFrameWithIterator) { - auto ir = SpdyMakeUnique<SpdyWindowUpdateIR>(1, 1); + auto ir = std::make_unique<SpdyWindowUpdateIR>(1, 1); RunTest(std::move(ir)); } TEST_F(SpdyControlFrameIteratorTest, AtlSvcFrameWithIterator) { - auto ir = SpdyMakeUnique<SpdyAltSvcIR>(3); + auto ir = std::make_unique<SpdyAltSvcIR>(3); ir->set_origin("origin"); ir->add_altsvc(SpdyAltSvcWireFormat::AlternativeService( "pid1", "host", 443, 5, SpdyAltSvcWireFormat::VersionVector())); @@ -2822,7 +2822,7 @@ } TEST_F(SpdyControlFrameIteratorTest, PriorityFrameWithIterator) { - auto ir = SpdyMakeUnique<SpdyPriorityIR>(2, 1, 17, true); + auto ir = std::make_unique<SpdyPriorityIR>(2, 1, 17, true); RunTest(std::move(ir)); } @@ -4619,7 +4619,7 @@ // to ProcessInput (i.e. will not be calling set_process_single_input_frame()). TEST_P(SpdyFramerTest, ProcessAllInput) { auto visitor = - SpdyMakeUnique<TestSpdyVisitor>(SpdyFramer::DISABLE_COMPRESSION); + std::make_unique<TestSpdyVisitor>(SpdyFramer::DISABLE_COMPRESSION); deframer_.set_visitor(visitor.get()); // Create two input frames. @@ -4704,7 +4704,7 @@ for (size_t first_size = 0; first_size <= buf_size; ++first_size) { SPDY_VLOG(1) << "first_size = " << first_size; auto visitor = - SpdyMakeUnique<TestSpdyVisitor>(SpdyFramer::DISABLE_COMPRESSION); + std::make_unique<TestSpdyVisitor>(SpdyFramer::DISABLE_COMPRESSION); deframer_.set_visitor(visitor.get()); EXPECT_EQ(Http2DecoderAdapter::SPDY_READY_FOR_FRAME, deframer_.state());
diff --git a/spdy/core/spdy_header_block.cc b/spdy/core/spdy_header_block.cc index 705038a..8a1b65f 100644 --- a/spdy/core/spdy_header_block.cc +++ b/spdy/core/spdy_header_block.cc
@@ -11,7 +11,6 @@ #include "net/third_party/quiche/src/spdy/platform/api/spdy_estimate_memory_usage.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_ptr_util.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_string_utils.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_unsafe_arena.h" @@ -362,7 +361,7 @@ SpdyHeaderBlock::Storage* SpdyHeaderBlock::GetStorage() { if (storage_ == nullptr) { - storage_ = SpdyMakeUnique<Storage>(); + storage_ = std::make_unique<Storage>(); } return storage_.get(); }
diff --git a/spdy/core/spdy_protocol.cc b/spdy/core/spdy_protocol.cc index dae7006..0ab6737 100644 --- a/spdy/core/spdy_protocol.cc +++ b/spdy/core/spdy_protocol.cc
@@ -8,7 +8,6 @@ #include <ostream> #include "net/third_party/quiche/src/spdy/platform/api/spdy_bug_tracker.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_ptr_util.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_string_utils.h" namespace spdy { @@ -295,7 +294,7 @@ SpdyDataIR::SpdyDataIR(SpdyStreamId stream_id, std::string data) : SpdyFrameWithFinIR(stream_id), - data_store_(SpdyMakeUnique<std::string>(std::move(data))), + data_store_(std::make_unique<std::string>(std::move(data))), data_(data_store_->data()), data_len_(data_store_->size()), padded_(false), @@ -415,7 +414,7 @@ SpdyContinuationIR::SpdyContinuationIR(SpdyStreamId stream_id) : SpdyFrameIR(stream_id), end_headers_(false) { - encoding_ = SpdyMakeUnique<std::string>(); + encoding_ = std::make_unique<std::string>(); } SpdyContinuationIR::~SpdyContinuationIR() = default;
diff --git a/spdy/core/spdy_protocol.h b/spdy/core/spdy_protocol.h index b014107..cb6906c 100644 --- a/spdy/core/spdy_protocol.h +++ b/spdy/core/spdy_protocol.h
@@ -25,7 +25,6 @@ #include "net/third_party/quiche/src/spdy/platform/api/spdy_bug_tracker.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_export.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_ptr_util.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_string_piece.h" namespace spdy { @@ -550,7 +549,7 @@ // Deep-copy of data (keep private copy). void SetDataDeep(SpdyStringPiece data) { - data_store_ = SpdyMakeUnique<std::string>(data.data(), data.size()); + data_store_ = std::make_unique<std::string>(data.data(), data.size()); data_ = data_store_->data(); data_len_ = data.size(); }