Use quiche string libraries in //third_party/quic/core/crypto gfe-relnote: n/a, no functional change PiperOrigin-RevId: 285405224 Change-Id: I4a7f6d34ee42a2929cbbff2f303ee36b5b6ceb8a
diff --git a/quic/core/crypto/crypto_handshake_message.cc b/quic/core/crypto/crypto_handshake_message.cc index 56f0bd6..d5b4635 100644 --- a/quic/core/crypto/crypto_handshake_message.cc +++ b/quic/core/crypto/crypto_handshake_message.cc
@@ -13,9 +13,10 @@ #include "net/third_party/quiche/src/quic/core/quic_socket_address_coder.h" #include "net/third_party/quiche/src/quic/core/quic_utils.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_text_utils.h" #include "net/third_party/quiche/src/common/platform/api/quiche_endian.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_str_cat.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_text_utils.h" namespace quic { @@ -85,7 +86,7 @@ } void CryptoHandshakeMessage::SetStringPiece(QuicTag tag, - QuicStringPiece value) { + quiche::QuicheStringPiece value) { tag_value_map_[tag] = std::string(value); } @@ -147,8 +148,9 @@ return QUIC_NO_ERROR; } -bool CryptoHandshakeMessage::GetStringPiece(QuicTag tag, - QuicStringPiece* out) const { +bool CryptoHandshakeMessage::GetStringPiece( + QuicTag tag, + quiche::QuicheStringPiece* out) const { auto it = tag_value_map_.find(tag); if (it == tag_value_map_.end()) { return false; @@ -164,8 +166,8 @@ QuicErrorCode CryptoHandshakeMessage::GetNthValue24( QuicTag tag, unsigned index, - QuicStringPiece* out) const { - QuicStringPiece value; + quiche::QuicheStringPiece* out) const { + quiche::QuicheStringPiece value; if (!GetStringPiece(tag, &value)) { return QUIC_CRYPTO_MESSAGE_PARAMETER_NOT_FOUND; } @@ -190,7 +192,7 @@ } if (i == index) { - *out = QuicStringPiece(value.data(), size); + *out = quiche::QuicheStringPiece(value.data(), size); return QUIC_NO_ERROR; } @@ -284,7 +286,7 @@ if (it->second.size() == 4) { uint32_t value; memcpy(&value, it->second.data(), sizeof(value)); - ret += QuicTextUtils::Uint64ToString(value); + ret += quiche::QuicheTextUtils::Uint64ToString(value); done = true; } break; @@ -345,8 +347,8 @@ } break; case kPAD: - ret += QuicStringPrintf("(%d bytes of padding)", - static_cast<int>(it->second.size())); + ret += quiche::QuicheStringPrintf("(%d bytes of padding)", + static_cast<int>(it->second.size())); done = true; break; case kSNI: @@ -359,7 +361,7 @@ if (!done) { // If there's no specific format for this tag, or the value is invalid, // then just use hex. - ret += "0x" + QuicTextUtils::HexEncode(it->second); + ret += "0x" + quiche::QuicheTextUtils::HexEncode(it->second); } ret += "\n"; }