Remove QuicString wrapper for std::string gfe-relnote: n/a (no functional change) PiperOrigin-RevId: 238124961 Change-Id: I36e66a4326b4118d70effd356aef9734d2893763
diff --git a/quic/core/crypto/aead_base_decrypter.cc b/quic/core/crypto/aead_base_decrypter.cc index 474c443..8fec273 100644 --- a/quic/core/crypto/aead_base_decrypter.cc +++ b/quic/core/crypto/aead_base_decrypter.cc
@@ -5,6 +5,7 @@ #include "net/third_party/quiche/src/quic/core/crypto/aead_base_decrypter.h" #include <cstdint> +#include <string> #include "third_party/boringssl/src/include/openssl/crypto.h" #include "third_party/boringssl/src/include/openssl/err.h" @@ -13,7 +14,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_string.h" namespace quic {
diff --git a/quic/core/crypto/aes_128_gcm_12_decrypter_test.cc b/quic/core/crypto/aes_128_gcm_12_decrypter_test.cc index d9b2e8d..fefd09f 100644 --- a/quic/core/crypto/aes_128_gcm_12_decrypter_test.cc +++ b/quic/core/crypto/aes_128_gcm_12_decrypter_test.cc
@@ -5,10 +5,10 @@ #include "net/third_party/quiche/src/quic/core/crypto/aes_128_gcm_12_decrypter.h" #include <memory> +#include <string> #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_string.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/quic_test_utils.h"
diff --git a/quic/core/crypto/aes_128_gcm_12_encrypter_test.cc b/quic/core/crypto/aes_128_gcm_12_encrypter_test.cc index 7aa1cf9..578c3be 100644 --- a/quic/core/crypto/aes_128_gcm_12_encrypter_test.cc +++ b/quic/core/crypto/aes_128_gcm_12_encrypter_test.cc
@@ -5,10 +5,10 @@ #include "net/third_party/quiche/src/quic/core/crypto/aes_128_gcm_12_encrypter.h" #include <memory> +#include <string> #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_string.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/quic_test_utils.h"
diff --git a/quic/core/crypto/aes_128_gcm_decrypter_test.cc b/quic/core/crypto/aes_128_gcm_decrypter_test.cc index 1ef986f..9e3d84d 100644 --- a/quic/core/crypto/aes_128_gcm_decrypter_test.cc +++ b/quic/core/crypto/aes_128_gcm_decrypter_test.cc
@@ -5,10 +5,10 @@ #include "net/third_party/quiche/src/quic/core/crypto/aes_128_gcm_decrypter.h" #include <memory> +#include <string> #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_string.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/quic_test_utils.h"
diff --git a/quic/core/crypto/aes_128_gcm_encrypter_test.cc b/quic/core/crypto/aes_128_gcm_encrypter_test.cc index e2e425e..8ad6e20 100644 --- a/quic/core/crypto/aes_128_gcm_encrypter_test.cc +++ b/quic/core/crypto/aes_128_gcm_encrypter_test.cc
@@ -5,10 +5,10 @@ #include "net/third_party/quiche/src/quic/core/crypto/aes_128_gcm_encrypter.h" #include <memory> +#include <string> #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_string.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/quic_test_utils.h"
diff --git a/quic/core/crypto/aes_256_gcm_decrypter_test.cc b/quic/core/crypto/aes_256_gcm_decrypter_test.cc index 16e2428..6929ed0 100644 --- a/quic/core/crypto/aes_256_gcm_decrypter_test.cc +++ b/quic/core/crypto/aes_256_gcm_decrypter_test.cc
@@ -5,10 +5,10 @@ #include "net/third_party/quiche/src/quic/core/crypto/aes_256_gcm_decrypter.h" #include <memory> +#include <string> #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_string.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/quic_test_utils.h"
diff --git a/quic/core/crypto/aes_256_gcm_encrypter_test.cc b/quic/core/crypto/aes_256_gcm_encrypter_test.cc index f70edbc..71e6a53 100644 --- a/quic/core/crypto/aes_256_gcm_encrypter_test.cc +++ b/quic/core/crypto/aes_256_gcm_encrypter_test.cc
@@ -5,10 +5,10 @@ #include "net/third_party/quiche/src/quic/core/crypto/aes_256_gcm_encrypter.h" #include <memory> +#include <string> #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_string.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/quic_test_utils.h"
diff --git a/quic/core/crypto/cert_compressor.cc b/quic/core/crypto/cert_compressor.cc index 53c6117..9ad2fc8 100644 --- a/quic/core/crypto/cert_compressor.cc +++ b/quic/core/crypto/cert_compressor.cc
@@ -6,10 +6,10 @@ #include <cstdint> #include <memory> +#include <string> #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_string.h" #include "third_party/zlib/zlib.h" namespace quic {
diff --git a/quic/core/crypto/cert_compressor.h b/quic/core/crypto/cert_compressor.h index fd73e6e..5dafe43 100644 --- a/quic/core/crypto/cert_compressor.h +++ b/quic/core/crypto/cert_compressor.h
@@ -5,13 +5,13 @@ #ifndef QUICHE_QUIC_CORE_CRYPTO_CERT_COMPRESSOR_H_ #define QUICHE_QUIC_CORE_CRYPTO_CERT_COMPRESSOR_H_ +#include <string> #include <vector> #include "base/macros.h" #include "net/third_party/quiche/src/quic/core/crypto/common_cert_set.h" #include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h" #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" namespace quic {
diff --git a/quic/core/crypto/cert_compressor_test.cc b/quic/core/crypto/cert_compressor_test.cc index e3ac2f1..1341f79 100644 --- a/quic/core/crypto/cert_compressor_test.cc +++ b/quic/core/crypto/cert_compressor_test.cc
@@ -5,9 +5,9 @@ #include "net/third_party/quiche/src/quic/core/crypto/cert_compressor.h" #include <memory> +#include <string> #include "net/third_party/quiche/src/quic/core/quic_utils.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.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/crypto_test_utils.h"
diff --git a/quic/core/crypto/chacha20_poly1305_decrypter_test.cc b/quic/core/crypto/chacha20_poly1305_decrypter_test.cc index d1c8d74..39c0e8a 100644 --- a/quic/core/crypto/chacha20_poly1305_decrypter_test.cc +++ b/quic/core/crypto/chacha20_poly1305_decrypter_test.cc
@@ -5,9 +5,9 @@ #include "net/third_party/quiche/src/quic/core/crypto/chacha20_poly1305_decrypter.h" #include <memory> +#include <string> #include "net/third_party/quiche/src/quic/core/quic_utils.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.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/quic_test_utils.h"
diff --git a/quic/core/crypto/chacha20_poly1305_encrypter_test.cc b/quic/core/crypto/chacha20_poly1305_encrypter_test.cc index 05f8274..e04d864 100644 --- a/quic/core/crypto/chacha20_poly1305_encrypter_test.cc +++ b/quic/core/crypto/chacha20_poly1305_encrypter_test.cc
@@ -5,11 +5,11 @@ #include "net/third_party/quiche/src/quic/core/crypto/chacha20_poly1305_encrypter.h" #include <memory> +#include <string> #include "net/third_party/quiche/src/quic/core/crypto/chacha20_poly1305_decrypter.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_string.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/quic_test_utils.h"
diff --git a/quic/core/crypto/chacha20_poly1305_tls_decrypter_test.cc b/quic/core/crypto/chacha20_poly1305_tls_decrypter_test.cc index 664abe2..71b60e6 100644 --- a/quic/core/crypto/chacha20_poly1305_tls_decrypter_test.cc +++ b/quic/core/crypto/chacha20_poly1305_tls_decrypter_test.cc
@@ -5,9 +5,9 @@ #include "net/third_party/quiche/src/quic/core/crypto/chacha20_poly1305_tls_decrypter.h" #include <memory> +#include <string> #include "net/third_party/quiche/src/quic/core/quic_utils.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.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/quic_test_utils.h"
diff --git a/quic/core/crypto/chacha20_poly1305_tls_encrypter_test.cc b/quic/core/crypto/chacha20_poly1305_tls_encrypter_test.cc index 6ac4810..9c2a6ba 100644 --- a/quic/core/crypto/chacha20_poly1305_tls_encrypter_test.cc +++ b/quic/core/crypto/chacha20_poly1305_tls_encrypter_test.cc
@@ -5,11 +5,11 @@ #include "net/third_party/quiche/src/quic/core/crypto/chacha20_poly1305_tls_encrypter.h" #include <memory> +#include <string> #include "net/third_party/quiche/src/quic/core/crypto/chacha20_poly1305_tls_decrypter.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_string.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/quic_test_utils.h"
diff --git a/quic/core/crypto/channel_id.h b/quic/core/crypto/channel_id.h index d94293c..ea9aa55 100644 --- a/quic/core/crypto/channel_id.h +++ b/quic/core/crypto/channel_id.h
@@ -6,11 +6,11 @@ #define QUICHE_QUIC_CORE_CRYPTO_CHANNEL_ID_H_ #include <memory> +#include <string> #include "base/macros.h" #include "net/third_party/quiche/src/quic/core/quic_types.h" #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" namespace quic {
diff --git a/quic/core/crypto/channel_id_test.cc b/quic/core/crypto/channel_id_test.cc index d904bcb..99a84dd 100644 --- a/quic/core/crypto/channel_id_test.cc +++ b/quic/core/crypto/channel_id_test.cc
@@ -5,8 +5,8 @@ #include "net/third_party/quiche/src/quic/core/crypto/channel_id.h" #include <memory> +#include <string> -#include "net/third_party/quiche/src/quic/platform/api/quic_string.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/crypto/crypto_framer.cc b/quic/core/crypto/crypto_framer.cc index d8a32bc..35c53a1 100644 --- a/quic/core/crypto/crypto_framer.cc +++ b/quic/core/crypto/crypto_framer.cc
@@ -4,6 +4,8 @@ #include "net/third_party/quiche/src/quic/core/crypto/crypto_framer.h" +#include <string> + #include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h" #include "net/third_party/quiche/src/quic/core/quic_data_reader.h" #include "net/third_party/quiche/src/quic/core/quic_data_writer.h" @@ -12,7 +14,6 @@ #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.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" namespace quic {
diff --git a/quic/core/crypto/crypto_framer.h b/quic/core/crypto/crypto_framer.h index 34234e2..7959c60 100644 --- a/quic/core/crypto/crypto_framer.h +++ b/quic/core/crypto/crypto_framer.h
@@ -8,6 +8,7 @@ #include <cstddef> #include <cstdint> #include <memory> +#include <string> #include <utility> #include <vector> @@ -15,7 +16,6 @@ #include "net/third_party/quiche/src/quic/core/crypto/crypto_message_parser.h" #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_string.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" namespace quic {
diff --git a/quic/core/crypto/crypto_handshake.h b/quic/core/crypto/crypto_handshake.h index 1e3d668..44ea433 100644 --- a/quic/core/crypto/crypto_handshake.h +++ b/quic/core/crypto/crypto_handshake.h
@@ -6,12 +6,12 @@ #define QUICHE_QUIC_CORE_CRYPTO_CRYPTO_HANDSHAKE_H_ #include <memory> +#include <string> #include <vector> #include "base/macros.h" #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_string.h" namespace quic {
diff --git a/quic/core/crypto/crypto_handshake_message.cc b/quic/core/crypto/crypto_handshake_message.cc index 46577b3..d31a568 100644 --- a/quic/core/crypto/crypto_handshake_message.cc +++ b/quic/core/crypto/crypto_handshake_message.cc
@@ -5,6 +5,7 @@ #include "net/third_party/quiche/src/quic/core/crypto/crypto_handshake_message.h" #include <memory> +#include <string> #include "net/third_party/quiche/src/quic/core/crypto/crypto_framer.h" #include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h" @@ -14,7 +15,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_endian.h" #include "net/third_party/quiche/src/quic/platform/api/quic_map_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.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h" namespace quic {
diff --git a/quic/core/crypto/crypto_handshake_message.h b/quic/core/crypto/crypto_handshake_message.h index 8a75436..6819e36 100644 --- a/quic/core/crypto/crypto_handshake_message.h +++ b/quic/core/crypto/crypto_handshake_message.h
@@ -8,11 +8,11 @@ #include <cstddef> #include <cstdint> #include <memory> +#include <string> #include <vector> #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_string.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/crypto/crypto_message_parser.h b/quic/core/crypto/crypto_message_parser.h index 3c70e6e..2638a19 100644 --- a/quic/core/crypto/crypto_message_parser.h +++ b/quic/core/crypto/crypto_message_parser.h
@@ -5,9 +5,10 @@ #ifndef QUICHE_QUIC_CORE_CRYPTO_CRYPTO_MESSAGE_PARSER_H_ #define QUICHE_QUIC_CORE_CRYPTO_CRYPTO_MESSAGE_PARSER_H_ +#include <string> + #include "net/third_party/quiche/src/quic/core/quic_error_codes.h" #include "net/third_party/quiche/src/quic/core/quic_types.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" namespace quic {
diff --git a/quic/core/crypto/crypto_message_printer_bin.cc b/quic/core/crypto/crypto_message_printer_bin.cc index 66fa7e4..c680290 100644 --- a/quic/core/crypto/crypto_message_printer_bin.cc +++ b/quic/core/crypto/crypto_message_printer_bin.cc
@@ -8,11 +8,11 @@ // Usage: crypto_message_printer_bin <hex of message> #include <iostream> +#include <string> #include "base/init_google.h" #include "net/third_party/quiche/src/quic/core/crypto/crypto_framer.h" #include "net/third_party/quiche/src/quic/core/quic_utils.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h" using quic::Perspective;
diff --git a/quic/core/crypto/crypto_protocol.h b/quic/core/crypto/crypto_protocol.h index d3304ba..d9a1ebc 100644 --- a/quic/core/crypto/crypto_protocol.h +++ b/quic/core/crypto/crypto_protocol.h
@@ -6,9 +6,9 @@ #define QUICHE_QUIC_CORE_CRYPTO_CRYPTO_PROTOCOL_H_ #include <cstddef> +#include <string> #include "net/third_party/quiche/src/quic/core/quic_tag.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" // Version and Crypto tags are written to the wire with a big-endian // representation of the name of the tag. For example
diff --git a/quic/core/crypto/crypto_secret_boxer.cc b/quic/core/crypto/crypto_secret_boxer.cc index 16e9d0c..40f69df 100644 --- a/quic/core/crypto/crypto_secret_boxer.cc +++ b/quic/core/crypto/crypto_secret_boxer.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include <cstdint> +#include <string> #include "net/third_party/quiche/src/quic/core/crypto/crypto_secret_boxer.h" @@ -10,7 +11,6 @@ #include "third_party/boringssl/src/include/openssl/err.h" #include "net/third_party/quiche/src/quic/core/crypto/quic_random.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" namespace quic {
diff --git a/quic/core/crypto/crypto_secret_boxer.h b/quic/core/crypto/crypto_secret_boxer.h index 13e0469..881f565 100644 --- a/quic/core/crypto/crypto_secret_boxer.h +++ b/quic/core/crypto/crypto_secret_boxer.h
@@ -7,12 +7,12 @@ #include <cstddef> #include <memory> +#include <string> #include <vector> #include "base/macros.h" #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" #include "net/third_party/quiche/src/quic/platform/api/quic_mutex.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" namespace quic {
diff --git a/quic/core/crypto/crypto_secret_boxer_test.cc b/quic/core/crypto/crypto_secret_boxer_test.cc index 8739977..06505d9 100644 --- a/quic/core/crypto/crypto_secret_boxer_test.cc +++ b/quic/core/crypto/crypto_secret_boxer_test.cc
@@ -4,8 +4,9 @@ #include "net/third_party/quiche/src/quic/core/crypto/crypto_secret_boxer.h" +#include <string> + #include "net/third_party/quiche/src/quic/core/crypto/quic_random.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" namespace quic {
diff --git a/quic/core/crypto/crypto_server_test.cc b/quic/core/crypto/crypto_server_test.cc index b6740e9..d654c4a 100644 --- a/quic/core/crypto/crypto_server_test.cc +++ b/quic/core/crypto/crypto_server_test.cc
@@ -6,6 +6,7 @@ #include <cstdint> #include <memory> #include <ostream> +#include <string> #include <vector> #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_ptr_util.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.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 ff682b3..ffb5f1c 100644 --- a/quic/core/crypto/crypto_utils.cc +++ b/quic/core/crypto/crypto_utils.cc
@@ -5,6 +5,7 @@ #include "net/third_party/quiche/src/quic/core/crypto/crypto_utils.h" #include <memory> +#include <string> #include "third_party/boringssl/src/include/openssl/bytestring.h" #include "third_party/boringssl/src/include/openssl/hkdf.h" @@ -25,7 +26,6 @@ #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.h" namespace quic {
diff --git a/quic/core/crypto/crypto_utils.h b/quic/core/crypto/crypto_utils.h index f340bf4..da186a8 100644 --- a/quic/core/crypto/crypto_utils.h +++ b/quic/core/crypto/crypto_utils.h
@@ -9,6 +9,7 @@ #include <cstddef> #include <cstdint> +#include <string> #include "base/macros.h" #include "third_party/boringssl/src/include/openssl/evp.h" @@ -19,7 +20,6 @@ #include "net/third_party/quiche/src/quic/core/quic_packets.h" #include "net/third_party/quiche/src/quic/core/quic_time.h" #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" namespace quic {
diff --git a/quic/core/crypto/crypto_utils_test.cc b/quic/core/crypto/crypto_utils_test.cc index c76337d..94b5098 100644 --- a/quic/core/crypto/crypto_utils_test.cc +++ b/quic/core/crypto/crypto_utils_test.cc
@@ -4,9 +4,10 @@ #include "net/third_party/quiche/src/quic/core/crypto/crypto_utils.h" +#include <string> + #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_string.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/quic_test_utils.h"
diff --git a/quic/core/crypto/curve25519_key_exchange.cc b/quic/core/crypto/curve25519_key_exchange.cc index 9c8e5ed..1400d0c 100644 --- a/quic/core/crypto/curve25519_key_exchange.cc +++ b/quic/core/crypto/curve25519_key_exchange.cc
@@ -5,11 +5,11 @@ #include "net/third_party/quiche/src/quic/core/crypto/curve25519_key_exchange.h" #include <cstdint> +#include <string> #include "third_party/boringssl/src/include/openssl/curve25519.h" #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_string.h" namespace quic { namespace {
diff --git a/quic/core/crypto/curve25519_key_exchange.h b/quic/core/crypto/curve25519_key_exchange.h index 115789c..5cefa55 100644 --- a/quic/core/crypto/curve25519_key_exchange.h +++ b/quic/core/crypto/curve25519_key_exchange.h
@@ -6,10 +6,10 @@ #define QUICHE_QUIC_CORE_CRYPTO_CURVE25519_KEY_EXCHANGE_H_ #include <cstdint> +#include <string> #include "net/third_party/quiche/src/quic/core/crypto/key_exchange.h" #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" namespace quic {
diff --git a/quic/core/crypto/curve25519_key_exchange_test.cc b/quic/core/crypto/curve25519_key_exchange_test.cc index 0c4f735..f5ccd80 100644 --- a/quic/core/crypto/curve25519_key_exchange_test.cc +++ b/quic/core/crypto/curve25519_key_exchange_test.cc
@@ -5,10 +5,10 @@ #include "net/third_party/quiche/src/quic/core/crypto/curve25519_key_exchange.h" #include <memory> +#include <string> #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_string.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" namespace quic {
diff --git a/quic/core/crypto/key_exchange.h b/quic/core/crypto/key_exchange.h index 8970b62..7d4f76d 100644 --- a/quic/core/crypto/key_exchange.h +++ b/quic/core/crypto/key_exchange.h
@@ -6,10 +6,10 @@ #define QUICHE_QUIC_CORE_CRYPTO_KEY_EXCHANGE_H_ #include <memory> +#include <string> #include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h" #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" namespace quic {
diff --git a/quic/core/crypto/p256_key_exchange.cc b/quic/core/crypto/p256_key_exchange.cc index a53efe5..f56a0aa 100644 --- a/quic/core/crypto/p256_key_exchange.cc +++ b/quic/core/crypto/p256_key_exchange.cc
@@ -6,6 +6,7 @@ #include <cstdint> #include <memory> +#include <string> #include <utility> #include "third_party/boringssl/src/include/openssl/ec.h" @@ -14,7 +15,6 @@ #include "third_party/boringssl/src/include/openssl/evp.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.h" namespace quic { namespace {
diff --git a/quic/core/crypto/p256_key_exchange.h b/quic/core/crypto/p256_key_exchange.h index 04301e4..4e6d0b2 100644 --- a/quic/core/crypto/p256_key_exchange.h +++ b/quic/core/crypto/p256_key_exchange.h
@@ -6,12 +6,12 @@ #define QUICHE_QUIC_CORE_CRYPTO_P256_KEY_EXCHANGE_H_ #include <cstdint> +#include <string> #include "base/macros.h" #include "third_party/boringssl/src/include/openssl/base.h" #include "net/third_party/quiche/src/quic/core/crypto/key_exchange.h" #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" namespace quic {
diff --git a/quic/core/crypto/p256_key_exchange_test.cc b/quic/core/crypto/p256_key_exchange_test.cc index 32d6bf1..11d7bd8 100644 --- a/quic/core/crypto/p256_key_exchange_test.cc +++ b/quic/core/crypto/p256_key_exchange_test.cc
@@ -5,9 +5,9 @@ #include "net/third_party/quiche/src/quic/core/crypto/p256_key_exchange.h" #include <memory> +#include <string> #include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" namespace quic {
diff --git a/quic/core/crypto/proof_source.cc b/quic/core/crypto/proof_source.cc index 4edb40d..73f1672 100644 --- a/quic/core/crypto/proof_source.cc +++ b/quic/core/crypto/proof_source.cc
@@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <string> + #include "net/third_party/quiche/src/quic/core/crypto/proof_source.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" namespace quic {
diff --git a/quic/core/crypto/proof_source.h b/quic/core/crypto/proof_source.h index 0f293be..cc777c7 100644 --- a/quic/core/crypto/proof_source.h +++ b/quic/core/crypto/proof_source.h
@@ -6,6 +6,7 @@ #define QUICHE_QUIC_CORE_CRYPTO_PROOF_SOURCE_H_ #include <memory> +#include <string> #include <vector> #include "net/third_party/quiche/src/quic/core/crypto/quic_crypto_proof.h" @@ -13,7 +14,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" #include "net/third_party/quiche/src/quic/platform/api/quic_reference_counted.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.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" namespace quic {
diff --git a/quic/core/crypto/proof_verifier.h b/quic/core/crypto/proof_verifier.h index 9178942..e6605bb 100644 --- a/quic/core/crypto/proof_verifier.h +++ b/quic/core/crypto/proof_verifier.h
@@ -6,12 +6,12 @@ #define QUICHE_QUIC_CORE_CRYPTO_PROOF_VERIFIER_H_ #include <memory> +#include <string> #include <vector> #include "net/third_party/quiche/src/quic/core/quic_packets.h" #include "net/third_party/quiche/src/quic/core/quic_types.h" #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" namespace quic {
diff --git a/quic/core/crypto/quic_compressed_certs_cache.cc b/quic/core/crypto/quic_compressed_certs_cache.cc index e07e924..ae2124c 100644 --- a/quic/core/crypto/quic_compressed_certs_cache.cc +++ b/quic/core/crypto/quic_compressed_certs_cache.cc
@@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <string> + #include "net/third_party/quiche/src/quic/core/crypto/quic_compressed_certs_cache.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" namespace quic {
diff --git a/quic/core/crypto/quic_compressed_certs_cache.h b/quic/core/crypto/quic_compressed_certs_cache.h index 340542a..2003187 100644 --- a/quic/core/crypto/quic_compressed_certs_cache.h +++ b/quic/core/crypto/quic_compressed_certs_cache.h
@@ -5,12 +5,12 @@ #ifndef QUICHE_QUIC_CORE_CRYPTO_QUIC_COMPRESSED_CERTS_CACHE_H_ #define QUICHE_QUIC_CORE_CRYPTO_QUIC_COMPRESSED_CERTS_CACHE_H_ +#include <string> #include <vector> #include "net/third_party/quiche/src/quic/core/crypto/proof_source.h" #include "net/third_party/quiche/src/quic/core/quic_lru_cache.h" #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" namespace quic {
diff --git a/quic/core/crypto/quic_compressed_certs_cache_test.cc b/quic/core/crypto/quic_compressed_certs_cache_test.cc index 788f1d7..d34ae00 100644 --- a/quic/core/crypto/quic_compressed_certs_cache_test.cc +++ b/quic/core/crypto/quic_compressed_certs_cache_test.cc
@@ -4,9 +4,10 @@ #include "net/third_party/quiche/src/quic/core/crypto/quic_compressed_certs_cache.h" +#include <string> + #include "base/macros.h" #include "net/third_party/quiche/src/quic/core/crypto/cert_compressor.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.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/crypto_test_utils.h"
diff --git a/quic/core/crypto/quic_crypto_client_config.cc b/quic/core/crypto/quic_crypto_client_config.cc index 8d34173..4400fea 100644 --- a/quic/core/crypto/quic_crypto_client_config.cc +++ b/quic/core/crypto/quic_crypto_client_config.cc
@@ -6,6 +6,7 @@ #include <algorithm> #include <memory> +#include <string> #include "third_party/boringssl/src/include/openssl/ssl.h" #include "net/third_party/quiche/src/quic/core/crypto/cert_compressor.h" @@ -32,7 +33,6 @@ #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_string.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_crypto_client_config.h b/quic/core/crypto/quic_crypto_client_config.h index 4c2004d..49b92b6 100644 --- a/quic/core/crypto/quic_crypto_client_config.h +++ b/quic/core/crypto/quic_crypto_client_config.h
@@ -8,6 +8,7 @@ #include <cstdint> #include <map> #include <memory> +#include <string> #include <vector> #include "base/macros.h" @@ -18,7 +19,6 @@ #include "net/third_party/quiche/src/quic/core/quic_server_id.h" #include "net/third_party/quiche/src/quic/platform/api/quic_export.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.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" namespace quic {
diff --git a/quic/core/crypto/quic_crypto_client_config_test.cc b/quic/core/crypto/quic_crypto_client_config_test.cc index 097f455..2158cd3 100644 --- a/quic/core/crypto/quic_crypto_client_config_test.cc +++ b/quic/core/crypto/quic_crypto_client_config_test.cc
@@ -4,13 +4,14 @@ #include "net/third_party/quiche/src/quic/core/crypto/quic_crypto_client_config.h" +#include <string> + #include "net/third_party/quiche/src/quic/core/crypto/proof_verifier.h" #include "net/third_party/quiche/src/quic/core/quic_server_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/tls_client_handshaker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_endian.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.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/mock_random.h"
diff --git a/quic/core/crypto/quic_crypto_proof.h b/quic/core/crypto/quic_crypto_proof.h index 88255dc..c335068 100644 --- a/quic/core/crypto/quic_crypto_proof.h +++ b/quic/core/crypto/quic_crypto_proof.h
@@ -5,8 +5,9 @@ #ifndef QUICHE_QUIC_CORE_CRYPTO_QUIC_CRYPTO_PROOF_H_ #define QUICHE_QUIC_CORE_CRYPTO_QUIC_CRYPTO_PROOF_H_ +#include <string> + #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.h" namespace quic {
diff --git a/quic/core/crypto/quic_crypto_server_config.cc b/quic/core/crypto/quic_crypto_server_config.cc index 2b54c73..a59edab 100644 --- a/quic/core/crypto/quic_crypto_server_config.cc +++ b/quic/core/crypto/quic_crypto_server_config.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include <cstdlib> #include <memory> +#include <string> #include "base/macros.h" #include "third_party/boringssl/src/include/openssl/sha.h" @@ -44,7 +45,6 @@ #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.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_crypto_server_config.h b/quic/core/crypto/quic_crypto_server_config.h index 858c95e..92be490 100644 --- a/quic/core/crypto/quic_crypto_server_config.h +++ b/quic/core/crypto/quic_crypto_server_config.h
@@ -9,6 +9,7 @@ #include <cstdint> #include <map> #include <memory> +#include <string> #include <vector> #include "base/macros.h" @@ -28,7 +29,6 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_mutex.h" #include "net/third_party/quiche/src/quic/platform/api/quic_reference_counted.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.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" namespace quic {
diff --git a/quic/core/crypto/quic_crypto_server_config_test.cc b/quic/core/crypto/quic_crypto_server_config_test.cc index 6d38bde..7f9c3fe 100644 --- a/quic/core/crypto/quic_crypto_server_config_test.cc +++ b/quic/core/crypto/quic_crypto_server_config_test.cc
@@ -7,6 +7,7 @@ #include <stdarg.h> #include <memory> +#include <string> #include "net/third_party/quiche/src/quic/core/crypto/cert_compressor.h" #include "net/third_party/quiche/src/quic/core/crypto/chacha20_poly1305_encrypter.h" @@ -17,7 +18,6 @@ #include "net/third_party/quiche/src/quic/core/quic_time.h" #include "net/third_party/quiche/src/quic/core/tls_server_handshaker.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.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/mock_clock.h"
diff --git a/quic/core/crypto/quic_decrypter.cc b/quic/core/crypto/quic_decrypter.cc index 1ab67ba..79369f0 100644 --- a/quic/core/crypto/quic_decrypter.cc +++ b/quic/core/crypto/quic_decrypter.cc
@@ -4,6 +4,8 @@ #include "net/third_party/quiche/src/quic/core/crypto/quic_decrypter.h" +#include <string> + #include "third_party/boringssl/src/include/openssl/tls1.h" #include "net/third_party/quiche/src/quic/core/crypto/aes_128_gcm_12_decrypter.h" #include "net/third_party/quiche/src/quic/core/crypto/aes_128_gcm_decrypter.h" @@ -16,7 +18,6 @@ #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_string.h" namespace quic {
diff --git a/quic/core/crypto/quic_decrypter.h b/quic/core/crypto/quic_decrypter.h index f55b00b..a2b104c 100644 --- a/quic/core/crypto/quic_decrypter.h +++ b/quic/core/crypto/quic_decrypter.h
@@ -8,11 +8,11 @@ #include <cstddef> #include <cstdint> #include <memory> +#include <string> #include "net/third_party/quiche/src/quic/core/crypto/quic_crypter.h" #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_string.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" namespace quic {
diff --git a/quic/core/crypto/quic_hkdf_test.cc b/quic/core/crypto/quic_hkdf_test.cc index fbf2860..e40bebf 100644 --- a/quic/core/crypto/quic_hkdf_test.cc +++ b/quic/core/crypto/quic_hkdf_test.cc
@@ -4,8 +4,9 @@ #include "net/third_party/quiche/src/quic/core/crypto/quic_hkdf.h" +#include <string> + #include "net/third_party/quiche/src/quic/platform/api/quic_arraysize.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_string.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"