Move QuicheTextUtils out of platform. All methods are now defined in terms of Abseil or STL, there is no need for QuicheTextUtils to live in platform. PiperOrigin-RevId: 370889335 Change-Id: Id75b2f7c6d694481eea17d85690ce12bca03f917
diff --git a/common/quiche_data_reader.cc b/common/quiche_data_reader.cc index c196b42..f20c752 100644 --- a/common/quiche_data_reader.cc +++ b/common/quiche_data_reader.cc
@@ -10,7 +10,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "common/platform/api/quiche_logging.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/quiche_endian.h" namespace quiche {
diff --git a/common/quiche_text_utils.cc b/common/quiche_text_utils.cc new file mode 100644 index 0000000..263c97e --- /dev/null +++ b/common/quiche_text_utils.cc
@@ -0,0 +1,77 @@ +// Copyright 2021 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 "common/quiche_text_utils.h" + +#include "absl/strings/escaping.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_format.h" + +namespace quiche { + +// static +void QuicheTextUtils::Base64Encode(const uint8_t* data, + size_t data_len, + std::string* output) { + absl::Base64Escape(std::string(reinterpret_cast<const char*>(data), data_len), + output); + // Remove padding. + size_t len = output->size(); + if (len >= 2) { + if ((*output)[len - 1] == '=') { + len--; + if ((*output)[len - 1] == '=') { + len--; + } + output->resize(len); + } + } +} + +// static +absl::optional<std::string> QuicheTextUtils::Base64Decode( + absl::string_view input) { + std::string output; + if (!absl::Base64Unescape(input, &output)) { + return absl::nullopt; + } + return output; +} + +// static +std::string QuicheTextUtils::HexDump(absl::string_view binary_data) { + const int kBytesPerLine = 16; // Maximum bytes dumped per line. + int offset = 0; + const char* p = binary_data.data(); + int bytes_remaining = binary_data.size(); + std::string output; + while (bytes_remaining > 0) { + const int line_bytes = std::min(bytes_remaining, kBytesPerLine); + absl::StrAppendFormat(&output, "0x%04x: ", offset); + for (int i = 0; i < kBytesPerLine; ++i) { + if (i < line_bytes) { + absl::StrAppendFormat(&output, "%02x", + static_cast<unsigned char>(p[i])); + } else { + absl::StrAppend(&output, " "); + } + if (i % 2) { + absl::StrAppend(&output, " "); + } + } + absl::StrAppend(&output, " "); + for (int i = 0; i < line_bytes; ++i) { + // Replace non-printable characters and 0x20 (space) with '.' + output += absl::ascii_isgraph(p[i]) ? p[i] : '.'; + } + + bytes_remaining -= line_bytes; + offset += line_bytes; + p += line_bytes; + absl::StrAppend(&output, "\n"); + } + return output; +} + +} // namespace quiche
diff --git a/common/platform/api/quiche_text_utils.h b/common/quiche_text_utils.h similarity index 66% rename from common/platform/api/quiche_text_utils.h rename to common/quiche_text_utils.h index 42b4115..c99d9e2 100644 --- a/common/platform/api/quiche_text_utils.h +++ b/common/quiche_text_utils.h
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef QUICHE_COMMON_PLATFORM_API_QUICHE_TEXT_UTILS_H_ -#define QUICHE_COMMON_PLATFORM_API_QUICHE_TEXT_UTILS_H_ +#ifndef QUICHE_COMMON_QUICHE_TEXT_UTILS_H_ +#define QUICHE_COMMON_QUICHE_TEXT_UTILS_H_ #include <string> +#include "absl/strings/ascii.h" #include "absl/strings/escaping.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "common/platform/api/quiche_export.h" -#include "net/quiche/common/platform/impl/quiche_text_utils_impl.h" namespace quiche { @@ -20,47 +20,41 @@ public: // Returns a new string in which |data| has been converted to lower case. static std::string ToLower(absl::string_view data) { - return quiche::QuicheTextUtilsImpl::ToLower(data); + return absl::AsciiStrToLower(data); } // Removes leading and trailing whitespace from |data|. static void RemoveLeadingAndTrailingWhitespace(absl::string_view* data) { - quiche::QuicheTextUtilsImpl::RemoveLeadingAndTrailingWhitespace(data); + *data = absl::StripAsciiWhitespace(*data); } // Base64 encodes with no padding |data_len| bytes of |data| into |output|. static void Base64Encode(const uint8_t* data, size_t data_len, - std::string* output) { - return quiche::QuicheTextUtilsImpl::Base64Encode(data, data_len, output); - } + std::string* output); // Decodes a base64-encoded |input|. Returns nullopt when the input is // invalid. - static absl::optional<std::string> Base64Decode(absl::string_view input) { - return quiche::QuicheTextUtilsImpl::Base64Decode(input); - } + static absl::optional<std::string> Base64Decode(absl::string_view input); // Returns a string containing hex and ASCII representations of |binary|, // side-by-side in the style of hexdump. Non-printable characters will be // printed as '.' in the ASCII output. // For example, given the input "Hello, QUIC!\01\02\03\04", returns: // "0x0000: 4865 6c6c 6f2c 2051 5549 4321 0102 0304 Hello,.QUIC!...." - static std::string HexDump(absl::string_view binary_data) { - return quiche::QuicheTextUtilsImpl::HexDump(binary_data); - } + static std::string HexDump(absl::string_view binary_data); // Returns true if |data| contains any uppercase characters. static bool ContainsUpperCase(absl::string_view data) { - return quiche::QuicheTextUtilsImpl::ContainsUpperCase(data); + return std::any_of(data.begin(), data.end(), absl::ascii_isupper); } // Returns true if |data| contains only decimal digits. static bool IsAllDigits(absl::string_view data) { - return quiche::QuicheTextUtilsImpl::IsAllDigits(data); + return std::all_of(data.begin(), data.end(), absl::ascii_isdigit); } }; } // namespace quiche -#endif // QUICHE_COMMON_PLATFORM_API_QUICHE_TEXT_UTILS_H_ +#endif // QUICHE_COMMON_QUICHE_TEXT_UTILS_H_
diff --git a/common/platform/api/quiche_text_utils_test.cc b/common/quiche_text_utils_test.cc similarity index 91% rename from common/platform/api/quiche_text_utils_test.cc rename to common/quiche_text_utils_test.cc index 4372c07..5c10cbf 100644 --- a/common/platform/api/quiche_text_utils_test.cc +++ b/common/quiche_text_utils_test.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" #include <string> @@ -12,9 +12,7 @@ namespace quiche { namespace test { -class QuicheTextUtilsTest : public QuicheTest {}; - -TEST_F(QuicheTextUtilsTest, ToLower) { +TEST(QuicheTextUtilsTest, ToLower) { EXPECT_EQ("lower", quiche::QuicheTextUtils::ToLower("LOWER")); EXPECT_EQ("lower", quiche::QuicheTextUtils::ToLower("lower")); EXPECT_EQ("lower", quiche::QuicheTextUtils::ToLower("lOwEr")); @@ -22,7 +20,7 @@ EXPECT_EQ("", quiche::QuicheTextUtils::ToLower("")); } -TEST_F(QuicheTextUtilsTest, RemoveLeadingAndTrailingWhitespace) { +TEST(QuicheTextUtilsTest, RemoveLeadingAndTrailingWhitespace) { std::string input; for (auto* input : {"text", " text", " text", "text ", "text ", " text ", @@ -33,7 +31,7 @@ } } -TEST_F(QuicheTextUtilsTest, HexDump) { +TEST(QuicheTextUtilsTest, HexDump) { // Verify output for empty input. EXPECT_EQ("", quiche::QuicheTextUtils::HexDump(absl::HexStringToBytes(""))); // Verify output of the HexDump method is as expected. @@ -64,7 +62,7 @@ quiche::QuicheTextUtils::HexDump(absl::HexStringToBytes("90aaff"))); } -TEST_F(QuicheTextUtilsTest, Base64Encode) { +TEST(QuicheTextUtilsTest, Base64Encode) { std::string output; std::string input = "Hello"; quiche::QuicheTextUtils::Base64Encode( @@ -82,7 +80,7 @@ output); } -TEST_F(QuicheTextUtilsTest, ContainsUpperCase) { +TEST(QuicheTextUtilsTest, ContainsUpperCase) { EXPECT_FALSE(quiche::QuicheTextUtils::ContainsUpperCase("abc")); EXPECT_FALSE(quiche::QuicheTextUtils::ContainsUpperCase("")); EXPECT_FALSE(quiche::QuicheTextUtils::ContainsUpperCase("123"));
diff --git a/quic/core/chlo_extractor.cc b/quic/core/chlo_extractor.cc index 48fe9a8..29a43a6 100644 --- a/quic/core/chlo_extractor.cc +++ b/quic/core/chlo_extractor.cc
@@ -17,7 +17,6 @@ #include "quic/core/quic_framer.h" #include "quic/core/quic_types.h" #include "quic/core/quic_utils.h" -#include "common/platform/api/quiche_text_utils.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 c16668b..dccd7df 100644 --- a/quic/core/crypto/aes_128_gcm_12_decrypter_test.cc +++ b/quic/core/crypto/aes_128_gcm_12_decrypter_test.cc
@@ -13,7 +13,6 @@ #include "quic/core/quic_utils.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/test_tools/quiche_test_utils.h" namespace {
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 5c093ad..67e35ed 100644 --- a/quic/core/crypto/aes_128_gcm_12_encrypter_test.cc +++ b/quic/core/crypto/aes_128_gcm_12_encrypter_test.cc
@@ -13,7 +13,6 @@ #include "quic/core/quic_utils.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/test_tools/quiche_test_utils.h" namespace {
diff --git a/quic/core/crypto/aes_128_gcm_decrypter_test.cc b/quic/core/crypto/aes_128_gcm_decrypter_test.cc index 6877d9d..25abd71 100644 --- a/quic/core/crypto/aes_128_gcm_decrypter_test.cc +++ b/quic/core/crypto/aes_128_gcm_decrypter_test.cc
@@ -12,7 +12,6 @@ #include "quic/core/quic_utils.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/test_tools/quiche_test_utils.h" namespace {
diff --git a/quic/core/crypto/aes_128_gcm_encrypter_test.cc b/quic/core/crypto/aes_128_gcm_encrypter_test.cc index d51c5de..7e5fb25 100644 --- a/quic/core/crypto/aes_128_gcm_encrypter_test.cc +++ b/quic/core/crypto/aes_128_gcm_encrypter_test.cc
@@ -12,7 +12,6 @@ #include "quic/core/quic_utils.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/test_tools/quiche_test_utils.h" namespace {
diff --git a/quic/core/crypto/aes_256_gcm_decrypter_test.cc b/quic/core/crypto/aes_256_gcm_decrypter_test.cc index bfafd2c..c63a589 100644 --- a/quic/core/crypto/aes_256_gcm_decrypter_test.cc +++ b/quic/core/crypto/aes_256_gcm_decrypter_test.cc
@@ -13,7 +13,6 @@ #include "quic/core/quic_utils.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/test_tools/quiche_test_utils.h" namespace {
diff --git a/quic/core/crypto/aes_256_gcm_encrypter_test.cc b/quic/core/crypto/aes_256_gcm_encrypter_test.cc index 8d4c1de..a2f8066 100644 --- a/quic/core/crypto/aes_256_gcm_encrypter_test.cc +++ b/quic/core/crypto/aes_256_gcm_encrypter_test.cc
@@ -13,7 +13,6 @@ #include "quic/core/quic_utils.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/test_tools/quiche_test_utils.h" namespace {
diff --git a/quic/core/crypto/cert_compressor_test.cc b/quic/core/crypto/cert_compressor_test.cc index b76ee7b..a024d13 100644 --- a/quic/core/crypto/cert_compressor_test.cc +++ b/quic/core/crypto/cert_compressor_test.cc
@@ -12,7 +12,6 @@ #include "quic/core/quic_utils.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/crypto_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" namespace quic { namespace test {
diff --git a/quic/core/crypto/certificate_view.cc b/quic/core/crypto/certificate_view.cc index c21dd20..4024a78 100644 --- a/quic/core/crypto/certificate_view.cc +++ b/quic/core/crypto/certificate_view.cc
@@ -30,9 +30,9 @@ #include "quic/platform/api/quic_bug_tracker.h" #include "quic/platform/api/quic_ip_address.h" #include "quic/platform/api/quic_logging.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/platform/api/quiche_time_utils.h" #include "common/quiche_data_reader.h" +#include "common/quiche_text_utils.h" namespace quic { namespace {
diff --git a/quic/core/crypto/chacha20_poly1305_decrypter_test.cc b/quic/core/crypto/chacha20_poly1305_decrypter_test.cc index 42d8899..93e48d2 100644 --- a/quic/core/crypto/chacha20_poly1305_decrypter_test.cc +++ b/quic/core/crypto/chacha20_poly1305_decrypter_test.cc
@@ -12,7 +12,6 @@ #include "quic/core/quic_utils.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/test_tools/quiche_test_utils.h" namespace {
diff --git a/quic/core/crypto/chacha20_poly1305_encrypter_test.cc b/quic/core/crypto/chacha20_poly1305_encrypter_test.cc index 8c403fe..cbce5b4 100644 --- a/quic/core/crypto/chacha20_poly1305_encrypter_test.cc +++ b/quic/core/crypto/chacha20_poly1305_encrypter_test.cc
@@ -13,7 +13,6 @@ #include "quic/core/quic_utils.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/test_tools/quiche_test_utils.h" namespace {
diff --git a/quic/core/crypto/chacha20_poly1305_tls_decrypter_test.cc b/quic/core/crypto/chacha20_poly1305_tls_decrypter_test.cc index 4b0f10b..b71bcf1 100644 --- a/quic/core/crypto/chacha20_poly1305_tls_decrypter_test.cc +++ b/quic/core/crypto/chacha20_poly1305_tls_decrypter_test.cc
@@ -12,7 +12,6 @@ #include "quic/core/quic_utils.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/test_tools/quiche_test_utils.h" namespace {
diff --git a/quic/core/crypto/chacha20_poly1305_tls_encrypter_test.cc b/quic/core/crypto/chacha20_poly1305_tls_encrypter_test.cc index 7bca425..61aaac7 100644 --- a/quic/core/crypto/chacha20_poly1305_tls_encrypter_test.cc +++ b/quic/core/crypto/chacha20_poly1305_tls_encrypter_test.cc
@@ -14,7 +14,6 @@ #include "quic/core/quic_utils.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/test_tools/quiche_test_utils.h" namespace {
diff --git a/quic/core/crypto/crypto_message_printer_bin.cc b/quic/core/crypto/crypto_message_printer_bin.cc index 3109924..68e3d9c 100644 --- a/quic/core/crypto/crypto_message_printer_bin.cc +++ b/quic/core/crypto/crypto_message_printer_bin.cc
@@ -13,7 +13,6 @@ #include "absl/strings/escaping.h" #include "quic/core/crypto/crypto_framer.h" #include "quic/core/quic_utils.h" -#include "common/platform/api/quiche_text_utils.h" using std::cerr; using std::cout;
diff --git a/quic/core/crypto/crypto_server_test.cc b/quic/core/crypto/crypto_server_test.cc index 7414eda..7fadbbd 100644 --- a/quic/core/crypto/crypto_server_test.cc +++ b/quic/core/crypto/crypto_server_test.cc
@@ -33,7 +33,6 @@ #include "quic/test_tools/mock_random.h" #include "quic/test_tools/quic_crypto_server_config_peer.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/quiche_endian.h" namespace quic {
diff --git a/quic/core/crypto/crypto_utils_test.cc b/quic/core/crypto/crypto_utils_test.cc index 4586b9b..0f2df3a 100644 --- a/quic/core/crypto/crypto_utils_test.cc +++ b/quic/core/crypto/crypto_utils_test.cc
@@ -11,7 +11,6 @@ #include "quic/core/quic_utils.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/test_tools/quiche_test_utils.h" namespace quic {
diff --git a/quic/core/crypto/quic_crypto_client_config.cc b/quic/core/crypto/quic_crypto_client_config.cc index c886cbe..3f94e7c 100644 --- a/quic/core/crypto/quic_crypto_client_config.cc +++ b/quic/core/crypto/quic_crypto_client_config.cc
@@ -34,7 +34,6 @@ #include "quic/platform/api/quic_hostname_utils.h" #include "quic/platform/api/quic_logging.h" #include "quic/platform/api/quic_map_util.h" -#include "common/platform/api/quiche_text_utils.h" namespace quic {
diff --git a/quic/core/crypto/quic_crypto_server_config.cc b/quic/core/crypto/quic_crypto_server_config.cc index dbe271d..f2a8809 100644 --- a/quic/core/crypto/quic_crypto_server_config.cc +++ b/quic/core/crypto/quic_crypto_server_config.cc
@@ -51,7 +51,6 @@ #include "quic/platform/api/quic_reference_counted.h" #include "quic/platform/api/quic_socket_address.h" #include "quic/platform/api/quic_testvalue.h" -#include "common/platform/api/quiche_text_utils.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 9f70c35..484e46e 100644 --- a/quic/core/crypto/quic_crypto_server_config_test.cc +++ b/quic/core/crypto/quic_crypto_server_config_test.cc
@@ -25,7 +25,6 @@ #include "quic/test_tools/mock_clock.h" #include "quic/test_tools/quic_crypto_server_config_peer.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" namespace quic { namespace test {
diff --git a/quic/core/crypto/quic_hkdf_test.cc b/quic/core/crypto/quic_hkdf_test.cc index 73f850e..e23d3f2 100644 --- a/quic/core/crypto/quic_hkdf_test.cc +++ b/quic/core/crypto/quic_hkdf_test.cc
@@ -9,7 +9,6 @@ #include "absl/base/macros.h" #include "absl/strings/escaping.h" #include "quic/platform/api/quic_test.h" -#include "common/platform/api/quiche_text_utils.h" namespace quic { namespace test {
diff --git a/quic/core/frames/quic_new_token_frame.cc b/quic/core/frames/quic_new_token_frame.cc index 8ad442f..8642fd9 100644 --- a/quic/core/frames/quic_new_token_frame.cc +++ b/quic/core/frames/quic_new_token_frame.cc
@@ -6,7 +6,6 @@ #include "absl/strings/escaping.h" #include "quic/platform/api/quic_logging.h" -#include "common/platform/api/quiche_text_utils.h" namespace quic {
diff --git a/quic/core/frames/quic_path_challenge_frame.cc b/quic/core/frames/quic_path_challenge_frame.cc index 857ca19..0f88bb8 100644 --- a/quic/core/frames/quic_path_challenge_frame.cc +++ b/quic/core/frames/quic_path_challenge_frame.cc
@@ -6,7 +6,6 @@ #include "absl/strings/escaping.h" #include "quic/platform/api/quic_bug_tracker.h" -#include "common/platform/api/quiche_text_utils.h" namespace quic {
diff --git a/quic/core/frames/quic_path_response_frame.cc b/quic/core/frames/quic_path_response_frame.cc index ade4156..f802b13 100644 --- a/quic/core/frames/quic_path_response_frame.cc +++ b/quic/core/frames/quic_path_response_frame.cc
@@ -6,7 +6,6 @@ #include "absl/strings/escaping.h" #include "quic/platform/api/quic_bug_tracker.h" -#include "common/platform/api/quiche_text_utils.h" namespace quic {
diff --git a/quic/core/http/http_decoder_test.cc b/quic/core/http/http_decoder_test.cc index 95c1c5c..05d580e 100644 --- a/quic/core/http/http_decoder_test.cc +++ b/quic/core/http/http_decoder_test.cc
@@ -19,7 +19,6 @@ #include "quic/platform/api/quic_flags.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" using ::testing::_; using ::testing::AnyNumber;
diff --git a/quic/core/http/quic_receive_control_stream.cc b/quic/core/http/quic_receive_control_stream.cc index 83a8940..39d8b42 100644 --- a/quic/core/http/quic_receive_control_stream.cc +++ b/quic/core/http/quic_receive_control_stream.cc
@@ -15,7 +15,7 @@ #include "quic/core/quic_types.h" #include "quic/platform/api/quic_flag_utils.h" #include "quic/platform/api/quic_flags.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" namespace quic {
diff --git a/quic/core/http/quic_receive_control_stream_test.cc b/quic/core/http/quic_receive_control_stream_test.cc index b81d0ba..03f21d8 100644 --- a/quic/core/http/quic_receive_control_stream_test.cc +++ b/quic/core/http/quic_receive_control_stream_test.cc
@@ -15,7 +15,6 @@ #include "quic/test_tools/quic_spdy_session_peer.h" #include "quic/test_tools/quic_stream_peer.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.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 d1be0df..c5af1dc 100644 --- a/quic/core/http/quic_send_control_stream_test.cc +++ b/quic/core/http/quic_send_control_stream_test.cc
@@ -13,7 +13,6 @@ #include "quic/test_tools/quic_config_peer.h" #include "quic/test_tools/quic_spdy_session_peer.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/test_tools/quiche_test_utils.h" namespace quic {
diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc index 084b596..9977288 100644 --- a/quic/core/http/quic_spdy_session.cc +++ b/quic/core/http/quic_spdy_session.cc
@@ -30,7 +30,6 @@ #include "quic/platform/api/quic_flags.h" #include "quic/platform/api/quic_logging.h" #include "quic/platform/api/quic_stack_trace.h" -#include "common/platform/api/quiche_text_utils.h" #include "spdy/core/http2_frame_decoder_adapter.h" using http2::Http2DecoderAdapter;
diff --git a/quic/core/http/quic_spdy_session_test.cc b/quic/core/http/quic_spdy_session_test.cc index dbf5def..7d4debb 100644 --- a/quic/core/http/quic_spdy_session_test.cc +++ b/quic/core/http/quic_spdy_session_test.cc
@@ -47,7 +47,6 @@ #include "quic/test_tools/quic_stream_peer.h" #include "quic/test_tools/quic_stream_send_buffer_peer.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/quiche_endian.h" #include "common/test_tools/quiche_test_utils.h" #include "spdy/core/spdy_framer.h"
diff --git a/quic/core/http/quic_spdy_stream.cc b/quic/core/http/quic_spdy_stream.cc index 4d4cc95..3e46fd6 100644 --- a/quic/core/http/quic_spdy_stream.cc +++ b/quic/core/http/quic_spdy_stream.cc
@@ -30,7 +30,7 @@ #include "quic/platform/api/quic_flags.h" #include "quic/platform/api/quic_logging.h" #include "quic/platform/api/quic_mem_slice_storage.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" #include "spdy/core/spdy_protocol.h" using spdy::SpdyHeaderBlock;
diff --git a/quic/core/http/spdy_utils.cc b/quic/core/http/spdy_utils.cc index d3a3c92..28b463a 100644 --- a/quic/core/http/spdy_utils.cc +++ b/quic/core/http/spdy_utils.cc
@@ -17,7 +17,7 @@ #include "quic/platform/api/quic_flags.h" #include "quic/platform/api/quic_logging.h" #include "quic/platform/api/quic_map_util.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" #include "spdy/core/spdy_protocol.h" using spdy::SpdyHeaderBlock;
diff --git a/quic/core/http/spdy_utils_test.cc b/quic/core/http/spdy_utils_test.cc index c7207f3..7307665 100644 --- a/quic/core/http/spdy_utils_test.cc +++ b/quic/core/http/spdy_utils_test.cc
@@ -9,7 +9,6 @@ #include "absl/strings/string_view.h" #include "quic/core/http/spdy_utils.h" #include "quic/platform/api/quic_test.h" -#include "common/platform/api/quiche_text_utils.h" using spdy::SpdyHeaderBlock; using testing::Pair;
diff --git a/quic/core/qpack/qpack_decoded_headers_accumulator_test.cc b/quic/core/qpack/qpack_decoded_headers_accumulator_test.cc index 9ba7f1c..217f866 100644 --- a/quic/core/qpack/qpack_decoded_headers_accumulator_test.cc +++ b/quic/core/qpack/qpack_decoded_headers_accumulator_test.cc
@@ -12,7 +12,6 @@ #include "quic/platform/api/quic_test.h" #include "quic/test_tools/qpack/qpack_decoder_test_utils.h" #include "quic/test_tools/qpack/qpack_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" using ::testing::_; using ::testing::ElementsAre;
diff --git a/quic/core/qpack/qpack_decoder_stream_receiver_test.cc b/quic/core/qpack/qpack_decoder_stream_receiver_test.cc index 272597a..0a76a17 100644 --- a/quic/core/qpack/qpack_decoder_stream_receiver_test.cc +++ b/quic/core/qpack/qpack_decoder_stream_receiver_test.cc
@@ -7,7 +7,6 @@ #include "absl/strings/escaping.h" #include "absl/strings/string_view.h" #include "quic/platform/api/quic_test.h" -#include "common/platform/api/quiche_text_utils.h" using testing::Eq; using testing::StrictMock;
diff --git a/quic/core/qpack/qpack_decoder_stream_sender_test.cc b/quic/core/qpack/qpack_decoder_stream_sender_test.cc index 275e76f..708e7a3 100644 --- a/quic/core/qpack/qpack_decoder_stream_sender_test.cc +++ b/quic/core/qpack/qpack_decoder_stream_sender_test.cc
@@ -7,7 +7,6 @@ #include "absl/strings/escaping.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/qpack/qpack_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" using ::testing::Eq; using ::testing::StrictMock;
diff --git a/quic/core/qpack/qpack_decoder_test.cc b/quic/core/qpack/qpack_decoder_test.cc index 3b57ca6..772b1d2 100644 --- a/quic/core/qpack/qpack_decoder_test.cc +++ b/quic/core/qpack/qpack_decoder_test.cc
@@ -13,7 +13,6 @@ #include "quic/platform/api/quic_test.h" #include "quic/test_tools/qpack/qpack_decoder_test_utils.h" #include "quic/test_tools/qpack/qpack_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" #include "spdy/core/spdy_header_block.h" using ::testing::_;
diff --git a/quic/core/qpack/qpack_encoder_stream_receiver_test.cc b/quic/core/qpack/qpack_encoder_stream_receiver_test.cc index efe5eb9..2fa440b 100644 --- a/quic/core/qpack/qpack_encoder_stream_receiver_test.cc +++ b/quic/core/qpack/qpack_encoder_stream_receiver_test.cc
@@ -7,7 +7,6 @@ #include "absl/strings/escaping.h" #include "absl/strings/string_view.h" #include "quic/platform/api/quic_test.h" -#include "common/platform/api/quiche_text_utils.h" using testing::Eq; using testing::StrictMock;
diff --git a/quic/core/qpack/qpack_encoder_stream_sender_test.cc b/quic/core/qpack/qpack_encoder_stream_sender_test.cc index 5078c8f..98e3e23 100644 --- a/quic/core/qpack/qpack_encoder_stream_sender_test.cc +++ b/quic/core/qpack/qpack_encoder_stream_sender_test.cc
@@ -7,7 +7,6 @@ #include "absl/strings/escaping.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/qpack/qpack_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" using ::testing::Eq; using ::testing::StrictMock;
diff --git a/quic/core/qpack/qpack_encoder_test.cc b/quic/core/qpack/qpack_encoder_test.cc index 1c00e88..21397ed 100644 --- a/quic/core/qpack/qpack_encoder_test.cc +++ b/quic/core/qpack/qpack_encoder_test.cc
@@ -15,7 +15,6 @@ #include "quic/test_tools/qpack/qpack_encoder_peer.h" #include "quic/test_tools/qpack/qpack_encoder_test_utils.h" #include "quic/test_tools/qpack/qpack_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" using ::testing::_; using ::testing::Eq;
diff --git a/quic/core/qpack/qpack_instruction_decoder_test.cc b/quic/core/qpack/qpack_instruction_decoder_test.cc index 3f68d74..b10c1b4 100644 --- a/quic/core/qpack/qpack_instruction_decoder_test.cc +++ b/quic/core/qpack/qpack_instruction_decoder_test.cc
@@ -12,7 +12,6 @@ #include "quic/platform/api/quic_logging.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/qpack/qpack_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" using ::testing::_; using ::testing::Eq;
diff --git a/quic/core/qpack/qpack_instruction_encoder_test.cc b/quic/core/qpack/qpack_instruction_encoder_test.cc index 36b89bd..c84634b 100644 --- a/quic/core/qpack/qpack_instruction_encoder_test.cc +++ b/quic/core/qpack/qpack_instruction_encoder_test.cc
@@ -8,7 +8,6 @@ #include "absl/strings/string_view.h" #include "quic/platform/api/quic_logging.h" #include "quic/platform/api/quic_test.h" -#include "common/platform/api/quiche_text_utils.h" namespace quic { namespace test {
diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc index 40397cc..c980f4e 100644 --- a/quic/core/quic_connection.cc +++ b/quic/core/quic_connection.cc
@@ -48,7 +48,7 @@ #include "quic/platform/api/quic_map_util.h" #include "quic/platform/api/quic_server_stats.h" #include "quic/platform/api/quic_socket_address.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" namespace quic {
diff --git a/quic/core/quic_connection_id.cc b/quic/core/quic_connection_id.cc index 303db8f..a8cb4c0 100644 --- a/quic/core/quic_connection_id.cc +++ b/quic/core/quic_connection_id.cc
@@ -18,7 +18,6 @@ #include "quic/platform/api/quic_flag_utils.h" #include "quic/platform/api/quic_flags.h" #include "quic/platform/api/quic_logging.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/quiche_endian.h" namespace quic {
diff --git a/quic/core/quic_crypto_server_stream.cc b/quic/core/quic_crypto_server_stream.cc index fc9be17..1dd6899 100644 --- a/quic/core/quic_crypto_server_stream.cc +++ b/quic/core/quic_crypto_server_stream.cc
@@ -11,7 +11,7 @@ #include "absl/strings/string_view.h" #include "third_party/boringssl/src/include/openssl/sha.h" #include "quic/platform/api/quic_flag_utils.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" namespace quic {
diff --git a/quic/core/quic_dispatcher.cc b/quic/core/quic_dispatcher.cc index 909ffb6..1c9c763 100644 --- a/quic/core/quic_dispatcher.cc +++ b/quic/core/quic_dispatcher.cc
@@ -26,7 +26,7 @@ #include "quic/platform/api/quic_flags.h" #include "quic/platform/api/quic_logging.h" #include "quic/platform/api/quic_stack_trace.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" namespace quic {
diff --git a/quic/core/quic_framer.cc b/quic/core/quic_framer.cc index 1b5db82..62264b7 100644 --- a/quic/core/quic_framer.cc +++ b/quic/core/quic_framer.cc
@@ -49,7 +49,7 @@ #include "quic/platform/api/quic_logging.h" #include "quic/platform/api/quic_map_util.h" #include "quic/platform/api/quic_stack_trace.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" namespace quic {
diff --git a/quic/core/quic_framer_test.cc b/quic/core/quic_framer_test.cc index 91eafc2..d1b53a4 100644 --- a/quic/core/quic_framer_test.cc +++ b/quic/core/quic_framer_test.cc
@@ -34,7 +34,6 @@ #include "quic/test_tools/quic_framer_peer.h" #include "quic/test_tools/quic_test_utils.h" #include "quic/test_tools/simple_data_producer.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/test_tools/quiche_test_utils.h" using testing::_;
diff --git a/quic/core/quic_legacy_version_encapsulator.cc b/quic/core/quic_legacy_version_encapsulator.cc index 27dbb9b..11d2293 100644 --- a/quic/core/quic_legacy_version_encapsulator.cc +++ b/quic/core/quic_legacy_version_encapsulator.cc
@@ -7,7 +7,6 @@ #include "quic/core/crypto/crypto_protocol.h" #include "quic/core/quic_utils.h" #include "quic/platform/api/quic_bug_tracker.h" -#include "common/platform/api/quiche_text_utils.h" namespace quic {
diff --git a/quic/core/quic_legacy_version_encapsulator_test.cc b/quic/core/quic_legacy_version_encapsulator_test.cc index 1d855f2..2f74d3a 100644 --- a/quic/core/quic_legacy_version_encapsulator_test.cc +++ b/quic/core/quic_legacy_version_encapsulator_test.cc
@@ -9,7 +9,6 @@ #include "quic/platform/api/quic_expect_bug.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" namespace quic { namespace test {
diff --git a/quic/core/quic_packet_creator.cc b/quic/core/quic_packet_creator.cc index 1267d81..f60b98f 100644 --- a/quic/core/quic_packet_creator.cc +++ b/quic/core/quic_packet_creator.cc
@@ -32,7 +32,6 @@ #include "quic/platform/api/quic_flags.h" #include "quic/platform/api/quic_logging.h" #include "quic/platform/api/quic_server_stats.h" -#include "common/platform/api/quiche_text_utils.h" namespace quic { namespace {
diff --git a/quic/core/quic_packets.cc b/quic/core/quic_packets.cc index 5cc593f..d625b5d 100644 --- a/quic/core/quic_packets.cc +++ b/quic/core/quic_packets.cc
@@ -15,7 +15,6 @@ #include "quic/core/quic_versions.h" #include "quic/platform/api/quic_flag_utils.h" #include "quic/platform/api/quic_flags.h" -#include "common/platform/api/quiche_text_utils.h" namespace quic {
diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc index 65dd0dd..fb564f0 100644 --- a/quic/core/quic_session.cc +++ b/quic/core/quic_session.cc
@@ -25,7 +25,7 @@ #include "quic/platform/api/quic_map_util.h" #include "quic/platform/api/quic_server_stats.h" #include "quic/platform/api/quic_stack_trace.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" using spdy::SpdyPriority;
diff --git a/quic/core/quic_tag.cc b/quic/core/quic_tag.cc index a6305b0..32b7bf9 100644 --- a/quic/core/quic_tag.cc +++ b/quic/core/quic_tag.cc
@@ -12,7 +12,7 @@ #include "absl/strings/str_split.h" #include "quic/platform/api/quic_flag_utils.h" #include "quic/platform/api/quic_flags.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" namespace quic {
diff --git a/quic/core/quic_time_wait_list_manager.cc b/quic/core/quic_time_wait_list_manager.cc index 5233d6d..5a682e2 100644 --- a/quic/core/quic_time_wait_list_manager.cc +++ b/quic/core/quic_time_wait_list_manager.cc
@@ -24,7 +24,7 @@ #include "quic/platform/api/quic_logging.h" #include "quic/platform/api/quic_map_util.h" #include "quic/platform/api/quic_socket_address.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" namespace quic {
diff --git a/quic/core/quic_versions.cc b/quic/core/quic_versions.cc index 185023f..ba2ec7e 100644 --- a/quic/core/quic_versions.cc +++ b/quic/core/quic_versions.cc
@@ -17,8 +17,8 @@ #include "quic/platform/api/quic_flag_utils.h" #include "quic/platform/api/quic_flags.h" #include "quic/platform/api/quic_logging.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/quiche_endian.h" +#include "common/quiche_text_utils.h" namespace quic { namespace {
diff --git a/quic/core/tls_chlo_extractor.cc b/quic/core/tls_chlo_extractor.cc index ae85b07..ac1fb18 100644 --- a/quic/core/tls_chlo_extractor.cc +++ b/quic/core/tls_chlo_extractor.cc
@@ -17,7 +17,6 @@ #include "quic/core/quic_types.h" #include "quic/core/quic_versions.h" #include "quic/platform/api/quic_bug_tracker.h" -#include "common/platform/api/quiche_text_utils.h" namespace quic {
diff --git a/quic/core/tls_client_handshaker.cc b/quic/core/tls_client_handshaker.cc index 76902aa..eb1859d 100644 --- a/quic/core/tls_client_handshaker.cc +++ b/quic/core/tls_client_handshaker.cc
@@ -17,7 +17,7 @@ #include "quic/core/quic_types.h" #include "quic/platform/api/quic_flags.h" #include "quic/platform/api/quic_hostname_utils.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" namespace quic {
diff --git a/quic/core/tls_server_handshaker.cc b/quic/core/tls_server_handshaker.cc index 85a984d..19642fe 100644 --- a/quic/core/tls_server_handshaker.cc +++ b/quic/core/tls_server_handshaker.cc
@@ -22,7 +22,6 @@ #include "quic/platform/api/quic_hostname_utils.h" #include "quic/platform/api/quic_logging.h" #include "quic/platform/api/quic_server_stats.h" -#include "common/platform/api/quiche_text_utils.h" #define RECORD_LATENCY_IN_US(stat_name, latency, comment) \ do { \
diff --git a/quic/masque/masque_client_bin.cc b/quic/masque/masque_client_bin.cc index 4d0523f..9203725 100644 --- a/quic/masque/masque_client_bin.cc +++ b/quic/masque/masque_client_bin.cc
@@ -22,7 +22,6 @@ #include "quic/platform/api/quic_system_event_loop.h" #include "quic/tools/fake_proof_verifier.h" #include "quic/tools/quic_url.h" -#include "common/platform/api/quiche_text_utils.h" DEFINE_QUIC_COMMAND_LINE_FLAG(bool, disable_certificate_verification,
diff --git a/quic/masque/masque_client_session.cc b/quic/masque/masque_client_session.cc index 8793d53..6eee553 100644 --- a/quic/masque/masque_client_session.cc +++ b/quic/masque/masque_client_session.cc
@@ -7,7 +7,6 @@ #include "quic/core/http/spdy_utils.h" #include "quic/core/quic_data_reader.h" #include "quic/core/quic_utils.h" -#include "common/platform/api/quiche_text_utils.h" namespace quic {
diff --git a/quic/masque/masque_compression_engine.cc b/quic/masque/masque_compression_engine.cc index 8413e0d..b021b41 100644 --- a/quic/masque/masque_compression_engine.cc +++ b/quic/masque/masque_compression_engine.cc
@@ -15,7 +15,7 @@ #include "quic/core/quic_types.h" #include "quic/core/quic_versions.h" #include "quic/platform/api/quic_containers.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" namespace quic {
diff --git a/quic/masque/masque_server_session.cc b/quic/masque/masque_server_session.cc index 036c75f..8a531ca 100644 --- a/quic/masque/masque_server_session.cc +++ b/quic/masque/masque_server_session.cc
@@ -13,7 +13,6 @@ #include "quic/core/quic_data_reader.h" #include "quic/core/quic_udp_socket.h" #include "quic/tools/quic_url.h" -#include "common/platform/api/quiche_text_utils.h" namespace quic {
diff --git a/quic/qbone/bonnet/icmp_reachable.cc b/quic/qbone/bonnet/icmp_reachable.cc index 4073e98..8e39996 100644 --- a/quic/qbone/bonnet/icmp_reachable.cc +++ b/quic/qbone/bonnet/icmp_reachable.cc
@@ -11,8 +11,8 @@ #include "quic/platform/api/quic_logging.h" #include "quic/platform/api/quic_mutex.h" #include "quic/qbone/platform/icmp_packet.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/quiche_endian.h" +#include "common/quiche_text_utils.h" namespace quic { namespace {
diff --git a/quic/qbone/platform/icmp_packet_test.cc b/quic/qbone/platform/icmp_packet_test.cc index 857cada..9721e36 100644 --- a/quic/qbone/platform/icmp_packet_test.cc +++ b/quic/qbone/platform/icmp_packet_test.cc
@@ -10,7 +10,7 @@ #include "absl/strings/string_view.h" #include "quic/platform/api/quic_test.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" namespace quic { namespace {
diff --git a/quic/qbone/platform/tcp_packet_test.cc b/quic/qbone/platform/tcp_packet_test.cc index df107d6..9da9cb8 100644 --- a/quic/qbone/platform/tcp_packet_test.cc +++ b/quic/qbone/platform/tcp_packet_test.cc
@@ -10,7 +10,7 @@ #include "absl/strings/string_view.h" #include "quic/platform/api/quic_test.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" namespace quic { namespace {
diff --git a/quic/qbone/qbone_session_test.cc b/quic/qbone/qbone_session_test.cc index f0d9d16..fb9a288 100644 --- a/quic/qbone/qbone_session_test.cc +++ b/quic/qbone/qbone_session_test.cc
@@ -23,7 +23,6 @@ #include "quic/test_tools/quic_connection_peer.h" #include "quic/test_tools/quic_session_peer.h" #include "quic/test_tools/quic_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" namespace quic { namespace test {
diff --git a/quic/quic_transport/quic_transport_server_session_test.cc b/quic/quic_transport/quic_transport_server_session_test.cc index c58e658..159f886 100644 --- a/quic/quic_transport/quic_transport_server_session_test.cc +++ b/quic/quic_transport/quic_transport_server_session_test.cc
@@ -21,7 +21,7 @@ #include "quic/test_tools/crypto_test_utils.h" #include "quic/test_tools/quic_test_utils.h" #include "quic/test_tools/quic_transport_test_tools.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" namespace quic { namespace test {
diff --git a/quic/quic_transport/web_transport_fingerprint_proof_verifier.cc b/quic/quic_transport/web_transport_fingerprint_proof_verifier.cc index cbe5545..7e43341 100644 --- a/quic/quic_transport/web_transport_fingerprint_proof_verifier.cc +++ b/quic/quic_transport/web_transport_fingerprint_proof_verifier.cc
@@ -14,7 +14,7 @@ #include "quic/core/quic_time.h" #include "quic/core/quic_types.h" #include "quic/platform/api/quic_bug_tracker.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" namespace quic { namespace {
diff --git a/quic/test_tools/crypto_test_utils.cc b/quic/test_tools/crypto_test_utils.cc index ac95dac..00264e5 100644 --- a/quic/test_tools/crypto_test_utils.cc +++ b/quic/test_tools/crypto_test_utils.cc
@@ -40,7 +40,6 @@ #include "quic/test_tools/quic_stream_peer.h" #include "quic/test_tools/quic_test_utils.h" #include "quic/test_tools/simple_quic_framer.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/test_tools/quiche_test_utils.h" namespace quic {
diff --git a/quic/test_tools/crypto_test_utils_test.cc b/quic/test_tools/crypto_test_utils_test.cc index ce45b82..b1f2115 100644 --- a/quic/test_tools/crypto_test_utils_test.cc +++ b/quic/test_tools/crypto_test_utils_test.cc
@@ -12,7 +12,6 @@ #include "quic/core/quic_utils.h" #include "quic/platform/api/quic_test.h" #include "quic/test_tools/mock_clock.h" -#include "common/platform/api/quiche_text_utils.h" namespace quic { namespace test {
diff --git a/quic/test_tools/qpack/qpack_offline_decoder.cc b/quic/test_tools/qpack/qpack_offline_decoder.cc index 6bad8d6..0f681fe 100644 --- a/quic/test_tools/qpack/qpack_offline_decoder.cc +++ b/quic/test_tools/qpack/qpack_offline_decoder.cc
@@ -38,7 +38,6 @@ #include "quic/platform/api/quic_file_utils.h" #include "quic/platform/api/quic_logging.h" #include "quic/test_tools/qpack/qpack_test_utils.h" -#include "common/platform/api/quiche_text_utils.h" #include "common/quiche_endian.h" namespace quic {
diff --git a/quic/test_tools/quic_test_client.cc b/quic/test_tools/quic_test_client.cc index ed823b1..7cc3ff9 100644 --- a/quic/test_tools/quic_test_client.cc +++ b/quic/test_tools/quic_test_client.cc
@@ -28,7 +28,7 @@ #include "quic/test_tools/quic_spdy_stream_peer.h" #include "quic/test_tools/quic_test_utils.h" #include "quic/tools/quic_url.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" namespace quic { namespace test {
diff --git a/quic/tools/quic_client_test.cc b/quic/tools/quic_client_test.cc index 160f255..d932a7b 100644 --- a/quic/tools/quic_client_test.cc +++ b/quic/tools/quic_client_test.cc
@@ -18,7 +18,7 @@ #include "quic/platform/api/quic_test_loopback.h" #include "quic/test_tools/crypto_test_utils.h" #include "quic/test_tools/quic_client_peer.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" namespace quic { namespace test {
diff --git a/quic/tools/quic_memory_cache_backend.cc b/quic/tools/quic_memory_cache_backend.cc index a5db77f..de20648 100644 --- a/quic/tools/quic_memory_cache_backend.cc +++ b/quic/tools/quic_memory_cache_backend.cc
@@ -16,7 +16,7 @@ #include "quic/platform/api/quic_logging.h" #include "quic/platform/api/quic_map_util.h" #include "quic/tools/web_transport_test_visitors.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" using spdy::Http2HeaderBlock; using spdy::kV3LowestPriority;
diff --git a/quic/tools/quic_packet_printer_bin.cc b/quic/tools/quic_packet_printer_bin.cc index 97ca71e..ad357e9 100644 --- a/quic/tools/quic_packet_printer_bin.cc +++ b/quic/tools/quic_packet_printer_bin.cc
@@ -34,7 +34,7 @@ #include "quic/core/quic_types.h" #include "quic/core/quic_utils.h" #include "quic/platform/api/quic_flags.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" DEFINE_QUIC_COMMAND_LINE_FLAG(std::string, quic_version,
diff --git a/quic/tools/quic_reject_reason_decoder_bin.cc b/quic/tools/quic_reject_reason_decoder_bin.cc index aecc8fe..68443f3 100644 --- a/quic/tools/quic_reject_reason_decoder_bin.cc +++ b/quic/tools/quic_reject_reason_decoder_bin.cc
@@ -11,7 +11,7 @@ #include "quic/core/crypto/crypto_handshake.h" #include "quic/core/crypto/crypto_utils.h" #include "quic/platform/api/quic_flags.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" using quic::CryptoUtils; using quic::HandshakeFailureReason;
diff --git a/quic/tools/quic_spdy_client_base.cc b/quic/tools/quic_spdy_client_base.cc index 974344e..4f51eb4 100644 --- a/quic/tools/quic_spdy_client_base.cc +++ b/quic/tools/quic_spdy_client_base.cc
@@ -13,7 +13,7 @@ #include "quic/core/quic_server_id.h" #include "quic/platform/api/quic_flags.h" #include "quic/platform/api/quic_logging.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" using spdy::Http2HeaderBlock;
diff --git a/quic/tools/quic_toy_client.cc b/quic/tools/quic_toy_client.cc index 15cdc29..ed8fd4e 100644 --- a/quic/tools/quic_toy_client.cc +++ b/quic/tools/quic_toy_client.cc
@@ -61,7 +61,7 @@ #include "quic/platform/api/quic_system_event_loop.h" #include "quic/tools/fake_proof_verifier.h" #include "quic/tools/quic_url.h" -#include "common/platform/api/quiche_text_utils.h" +#include "common/quiche_text_utils.h" namespace {