Remove QuicString wrapper for std::string gfe-relnote: n/a (no functional change) PiperOrigin-RevId: 238124961 Change-Id: I36e66a4326b4118d70effd356aef9734d2893763
diff --git a/quic/core/qpack/fuzzer/qpack_encoder_stream_sender_fuzzer.cc b/quic/core/qpack/fuzzer/qpack_encoder_stream_sender_fuzzer.cc index bc4de90..844d57a 100644 --- a/quic/core/qpack/fuzzer/qpack_encoder_stream_sender_fuzzer.cc +++ b/quic/core/qpack/fuzzer/qpack_encoder_stream_sender_fuzzer.cc
@@ -7,10 +7,10 @@ #include <cstddef> #include <cstdint> #include <limits> +#include <string> #include "net/third_party/quiche/src/quic/core/qpack/qpack_encoder_test_utils.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_string.h" #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h" namespace quic {
diff --git a/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc b/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc index 3c21964..15608da 100644 --- a/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc +++ b/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc
@@ -4,11 +4,11 @@ #include <cstddef> #include <cstdint> +#include <string> #include "net/third_party/quiche/src/quic/core/qpack/qpack_decoder_test_utils.h" #include "net/third_party/quiche/src/quic/core/qpack/qpack_encoder_test_utils.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_string.h" #include "net/third_party/quiche/src/spdy/core/spdy_header_block.h" namespace quic {
diff --git a/quic/core/qpack/offline/qpack_offline_decoder.cc b/quic/core/qpack/offline/qpack_offline_decoder.cc index 137ee7c..42f572b 100644 --- a/quic/core/qpack/offline/qpack_offline_decoder.cc +++ b/quic/core/qpack/offline/qpack_offline_decoder.cc
@@ -5,6 +5,7 @@ #include "net/third_party/quiche/src/quic/core/qpack/offline/qpack_offline_decoder.h" #include <cstdint> +#include <string> #include <utility> #include "net/third_party/quiche/src/quic/core/qpack/qpack_test_utils.h" @@ -12,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_string.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h" namespace quic {
diff --git a/quic/core/qpack/qpack_constants.h b/quic/core/qpack/qpack_constants.h index 7b7eb47..2812e63 100644 --- a/quic/core/qpack/qpack_constants.h +++ b/quic/core/qpack/qpack_constants.h
@@ -6,11 +6,11 @@ #define QUICHE_QUIC_CORE_QPACK_QPACK_CONSTANTS_H_ #include <cstdint> +#include <string> #include <tuple> #include <vector> #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/qpack/qpack_decoded_headers_accumulator.h b/quic/core/qpack/qpack_decoded_headers_accumulator.h index 889769f..f9e8feb 100644 --- a/quic/core/qpack/qpack_decoded_headers_accumulator.h +++ b/quic/core/qpack/qpack_decoded_headers_accumulator.h
@@ -6,12 +6,12 @@ #define QUICHE_QUIC_CORE_QPACK_QPACK_DECODED_HEADERS_ACCUMULATOR_H_ #include <cstddef> +#include <string> #include "net/third_party/quiche/src/quic/core/http/quic_header_list.h" #include "net/third_party/quiche/src/quic/core/qpack/qpack_progressive_decoder.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/qpack/qpack_decoder_stream_sender.cc b/quic/core/qpack/qpack_decoder_stream_sender.cc index cdb3b35..9474d6c 100644 --- a/quic/core/qpack/qpack_decoder_stream_sender.cc +++ b/quic/core/qpack/qpack_decoder_stream_sender.cc
@@ -6,10 +6,10 @@ #include <cstddef> #include <limits> +#include <string> #include "net/third_party/quiche/src/quic/core/qpack/qpack_constants.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/qpack/qpack_encoder.cc b/quic/core/qpack/qpack_encoder.cc index 6019229..7cf7ac7 100644 --- a/quic/core/qpack/qpack_encoder.cc +++ b/quic/core/qpack/qpack_encoder.cc
@@ -4,10 +4,11 @@ #include "net/third_party/quiche/src/quic/core/qpack/qpack_encoder.h" +#include <string> + #include "base/logging.h" #include "net/third_party/quiche/src/quic/core/qpack/qpack_progressive_encoder.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" namespace quic {
diff --git a/quic/core/qpack/qpack_encoder_stream_receiver.h b/quic/core/qpack/qpack_encoder_stream_receiver.h index 66a2985..5519b4c 100644 --- a/quic/core/qpack/qpack_encoder_stream_receiver.h +++ b/quic/core/qpack/qpack_encoder_stream_receiver.h
@@ -6,10 +6,10 @@ #define QUICHE_QUIC_CORE_QPACK_QPACK_ENCODER_STREAM_RECEIVER_H_ #include <cstdint> +#include <string> #include "net/third_party/quiche/src/quic/core/qpack/qpack_instruction_decoder.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/qpack/qpack_encoder_stream_sender.cc b/quic/core/qpack/qpack_encoder_stream_sender.cc index 6cd458a..3fb3b33 100644 --- a/quic/core/qpack/qpack_encoder_stream_sender.cc +++ b/quic/core/qpack/qpack_encoder_stream_sender.cc
@@ -6,10 +6,10 @@ #include <cstddef> #include <limits> +#include <string> #include "net/third_party/quiche/src/quic/core/qpack/qpack_constants.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/qpack/qpack_encoder_test.cc b/quic/core/qpack/qpack_encoder_test.cc index 939856d..fb07d49 100644 --- a/quic/core/qpack/qpack_encoder_test.cc +++ b/quic/core/qpack/qpack_encoder_test.cc
@@ -4,10 +4,11 @@ #include "net/third_party/quiche/src/quic/core/qpack/qpack_encoder.h" +#include <string> + #include "testing/gtest/include/gtest/gtest.h" #include "net/third_party/quiche/src/quic/core/qpack/qpack_encoder_test_utils.h" #include "net/third_party/quiche/src/quic/core/qpack/qpack_test_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"
diff --git a/quic/core/qpack/qpack_encoder_test_utils.h b/quic/core/qpack/qpack_encoder_test_utils.h index cb27ab5..3c9b404 100644 --- a/quic/core/qpack/qpack_encoder_test_utils.h +++ b/quic/core/qpack/qpack_encoder_test_utils.h
@@ -5,9 +5,10 @@ #ifndef QUICHE_QUIC_CORE_QPACK_QPACK_ENCODER_TEST_UTILS_H_ #define QUICHE_QUIC_CORE_QPACK_QPACK_ENCODER_TEST_UTILS_H_ +#include <string> + #include "net/third_party/quiche/src/quic/core/qpack/qpack_encoder.h" #include "net/third_party/quiche/src/quic/core/qpack/qpack_test_utils.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/spdy/core/spdy_header_block.h"
diff --git a/quic/core/qpack/qpack_instruction_decoder.h b/quic/core/qpack/qpack_instruction_decoder.h index 49fb0cc..f478c24 100644 --- a/quic/core/qpack/qpack_instruction_decoder.h +++ b/quic/core/qpack/qpack_instruction_decoder.h
@@ -7,12 +7,12 @@ #include <cstddef> #include <cstdint> +#include <string> #include "net/third_party/quiche/src/http2/hpack/huffman/hpack_huffman_decoder.h" #include "net/third_party/quiche/src/http2/hpack/varint/hpack_varint_decoder.h" #include "net/third_party/quiche/src/quic/core/qpack/qpack_constants.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/qpack/qpack_instruction_encoder.h b/quic/core/qpack/qpack_instruction_encoder.h index c95ceec..917378e 100644 --- a/quic/core/qpack/qpack_instruction_encoder.h +++ b/quic/core/qpack/qpack_instruction_encoder.h
@@ -7,11 +7,11 @@ #include <cstddef> #include <cstdint> +#include <string> #include "net/third_party/quiche/src/http2/hpack/varint/hpack_varint_encoder.h" #include "net/third_party/quiche/src/quic/core/qpack/qpack_constants.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/qpack/qpack_progressive_decoder.h b/quic/core/qpack/qpack_progressive_decoder.h index 7988861..52adf45 100644 --- a/quic/core/qpack/qpack_progressive_decoder.h +++ b/quic/core/qpack/qpack_progressive_decoder.h
@@ -7,13 +7,13 @@ #include <cstdint> #include <memory> +#include <string> #include "net/third_party/quiche/src/quic/core/qpack/qpack_decoder_stream_sender.h" #include "net/third_party/quiche/src/quic/core/qpack/qpack_encoder_stream_receiver.h" #include "net/third_party/quiche/src/quic/core/qpack/qpack_instruction_decoder.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/qpack/qpack_progressive_encoder.cc b/quic/core/qpack/qpack_progressive_encoder.cc index 497465b..30f5c36 100644 --- a/quic/core/qpack/qpack_progressive_encoder.cc +++ b/quic/core/qpack/qpack_progressive_encoder.cc
@@ -4,10 +4,11 @@ #include "net/third_party/quiche/src/quic/core/qpack/qpack_progressive_encoder.h" +#include <string> + #include "base/logging.h" #include "net/third_party/quiche/src/quic/core/qpack/qpack_constants.h" #include "net/third_party/quiche/src/quic/core/qpack/qpack_header_table.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/qpack/qpack_round_trip_test.cc b/quic/core/qpack/qpack_round_trip_test.cc index 99d55fb..9b2df55 100644 --- a/quic/core/qpack/qpack_round_trip_test.cc +++ b/quic/core/qpack/qpack_round_trip_test.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <string> #include <tuple> #include "testing/gtest/include/gtest/gtest.h" #include "net/third_party/quiche/src/quic/core/qpack/qpack_decoder_test_utils.h" #include "net/third_party/quiche/src/quic/core/qpack/qpack_encoder_test_utils.h" #include "net/third_party/quiche/src/quic/core/qpack/qpack_test_utils.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/spdy/core/spdy_header_block.h"