Index: net/tools/quic/stateless_rejector_test.cc |
diff --git a/net/tools/quic/stateless_rejector_test.cc b/net/tools/quic/stateless_rejector_test.cc |
index 9ecef237a5c16c45b022bcc908a68731f96dc4d2..c2ab54c49f53dd9dd630005f381908153601a9d0 100644 |
--- a/net/tools/quic/stateless_rejector_test.cc |
+++ b/net/tools/quic/stateless_rejector_test.cc |
@@ -8,11 +8,11 @@ |
#include <vector> |
#include "base/memory/ptr_util.h" |
-#include "base/strings/stringprintf.h" |
#include "net/quic/core/crypto/crypto_handshake_message.h" |
#include "net/quic/core/crypto/proof_source.h" |
#include "net/quic/core/quic_utils.h" |
#include "net/quic/platform/api/quic_str_cat.h" |
+#include "net/quic/platform/api/quic_text_utils.h" |
#include "net/quic/test_tools/crypto_test_utils.h" |
#include "net/quic/test_tools/quic_crypto_server_config_peer.h" |
#include "net/quic/test_tools/quic_test_utils.h" |
@@ -100,7 +100,8 @@ class StatelessRejectorTest : public ::testing::TestWithParam<TestParams> { |
QuicRandom::GetInstance(), &clock_, config_options_)); |
// Save the server config. |
- scid_hex_ = "#" + QuicUtils::HexEncode(config_peer_.GetPrimaryConfig()->id); |
+ scid_hex_ = |
+ "#" + QuicTextUtils::HexEncode(config_peer_.GetPrimaryConfig()->id); |
// Encode the QUIC version. |
ver_hex_ = QuicTagToString(QuicVersionToQuicTag(GetParam().version)); |
@@ -108,7 +109,8 @@ class StatelessRejectorTest : public ::testing::TestWithParam<TestParams> { |
// Generate a public value. |
char public_value[32]; |
memset(public_value, 42, sizeof(public_value)); |
- pubs_hex_ = "#" + QuicUtils::HexEncode(public_value, sizeof(public_value)); |
+ pubs_hex_ = |
+ "#" + QuicTextUtils::HexEncode(public_value, sizeof(public_value)); |
// Generate a client nonce. |
string nonce; |
@@ -118,7 +120,7 @@ class StatelessRejectorTest : public ::testing::TestWithParam<TestParams> { |
reinterpret_cast<char*>(config_peer_.GetPrimaryConfig()->orbit), |
kOrbitSize), |
&nonce); |
- nonc_hex_ = "#" + QuicUtils::HexEncode(nonce); |
+ nonc_hex_ = "#" + QuicTextUtils::HexEncode(nonce); |
// Generate a source address token. |
SourceAddressTokens previous_tokens; |
@@ -127,7 +129,7 @@ class StatelessRejectorTest : public ::testing::TestWithParam<TestParams> { |
string stk = config_peer_.NewSourceAddressToken( |
config_peer_.GetPrimaryConfig()->id, previous_tokens, ip, &rand, |
clock_.WallNow(), nullptr); |
- stk_hex_ = "#" + QuicUtils::HexEncode(stk); |
+ stk_hex_ = "#" + QuicTextUtils::HexEncode(stk); |
} |
protected: |
@@ -253,8 +255,8 @@ TEST_P(StatelessRejectorTest, RejectChlo) { |
TEST_P(StatelessRejectorTest, AcceptChlo) { |
const uint64_t xlct = CryptoTestUtils::LeafCertHashForTesting(); |
const string xlct_hex = |
- "#" + |
- QuicUtils::HexEncode(reinterpret_cast<const char*>(&xlct), sizeof(xlct)); |
+ "#" + QuicTextUtils::HexEncode(reinterpret_cast<const char*>(&xlct), |
+ sizeof(xlct)); |
// clang-format off |
const CryptoHandshakeMessage client_hello = CryptoTestUtils::Message( |
"CHLO", |