Use quiche string libraries in third_party/quic/test_tools
gfe-relnote: n/a, no functional change
PiperOrigin-RevId: 285009487
Change-Id: Ib5df01e93b8567c062cac8e5469e1ff86161445f
diff --git a/quic/test_tools/quic_test_utils.h b/quic/test_tools/quic_test_utils.h
index d8fbc78..c9197f3 100644
--- a/quic/test_tools/quic_test_utils.h
+++ b/quic/test_tools/quic_test_utils.h
@@ -23,12 +23,12 @@
#include "net/third_party/quiche/src/quic/core/quic_sent_packet_manager.h"
#include "net/third_party/quiche/src/quic/core/quic_simple_buffer_allocator.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_mem_slice_storage.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_piece.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_test.h"
#include "net/third_party/quiche/src/quic/test_tools/mock_clock.h"
#include "net/third_party/quiche/src/quic/test_tools/mock_quic_session_visitor.h"
#include "net/third_party/quiche/src/quic/test_tools/mock_random.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"
namespace quic {
@@ -228,7 +228,7 @@
size_t packet_size);
// Compute SHA-1 hash of the supplied std::string.
-std::string Sha1Hash(QuicStringPiece data);
+std::string Sha1Hash(quiche::QuicheStringPiece data);
// Delete |frame| and return true.
bool ClearControlFrame(const QuicFrame& frame);
@@ -274,7 +274,7 @@
MOCK_METHOD3(OnRetryPacket,
void(QuicConnectionId original_connection_id,
QuicConnectionId new_connection_id,
- QuicStringPiece retry_token));
+ quiche::QuicheStringPiece retry_token));
// The constructor sets this up to return true by default.
MOCK_METHOD1(OnUnauthenticatedHeader, bool(const QuicPacketHeader& header));
// The constructor sets this up to return true by default.
@@ -333,7 +333,7 @@
const QuicVersionNegotiationPacket& /*packet*/) override {}
void OnRetryPacket(QuicConnectionId /*original_connection_id*/,
QuicConnectionId /*new_connection_id*/,
- QuicStringPiece /*retry_token*/) override {}
+ quiche::QuicheStringPiece /*retry_token*/) override {}
bool OnProtocolVersionMismatch(ParsedQuicVersion version) override;
bool OnUnauthenticatedHeader(const QuicPacketHeader& header) override;
bool OnUnauthenticatedPublicHeader(const QuicPacketHeader& header) override;
@@ -389,7 +389,7 @@
MOCK_METHOD1(OnBlockedFrame, void(const QuicBlockedFrame& frame));
MOCK_METHOD1(OnRstStream, void(const QuicRstStreamFrame& frame));
MOCK_METHOD1(OnGoAway, void(const QuicGoAwayFrame& frame));
- MOCK_METHOD1(OnMessageReceived, void(QuicStringPiece message));
+ MOCK_METHOD1(OnMessageReceived, void(quiche::QuicheStringPiece message));
MOCK_METHOD2(OnConnectionClosed,
void(const QuicConnectionCloseFrame& frame,
ConnectionCloseSource source));
@@ -648,7 +648,8 @@
QuicStreamOffset bytes_written));
MOCK_METHOD2(OnStreamHeaders,
- void(QuicStreamId stream_id, QuicStringPiece headers_data));
+ void(QuicStreamId stream_id,
+ quiche::QuicheStringPiece headers_data));
MOCK_METHOD2(OnStreamHeadersPriority,
void(QuicStreamId stream_id, spdy::SpdyPriority priority));
MOCK_METHOD3(OnStreamHeadersComplete,
@@ -658,9 +659,9 @@
MOCK_METHOD1(OnCryptoHandshakeEvent, void(QuicSession::CryptoHandshakeEvent));
MOCK_CONST_METHOD0(GetAlpnsToOffer, std::vector<std::string>());
MOCK_CONST_METHOD1(SelectAlpn,
- std::vector<QuicStringPiece>::const_iterator(
- const std::vector<QuicStringPiece>&));
- MOCK_METHOD1(OnAlpnSelected, void(QuicStringPiece));
+ std::vector<quiche::QuicheStringPiece>::const_iterator(
+ const std::vector<quiche::QuicheStringPiece>&));
+ MOCK_METHOD1(OnAlpnSelected, void(quiche::QuicheStringPiece));
using QuicSession::ActivateStream;
@@ -744,7 +745,8 @@
QuicStreamOffset bytes_written));
MOCK_METHOD2(OnStreamHeaders,
- void(QuicStreamId stream_id, QuicStringPiece headers_data));
+ void(QuicStreamId stream_id,
+ quiche::QuicheStringPiece headers_data));
MOCK_METHOD2(OnStreamHeadersPriority,
void(QuicStreamId stream_id,
const spdy::SpdyStreamPrecedence& precedence));
@@ -756,7 +758,8 @@
size_t frame_len,
const QuicHeaderList& header_list));
MOCK_METHOD2(OnPromiseHeaders,
- void(QuicStreamId stream_id, QuicStringPiece headers_data));
+ void(QuicStreamId stream_id,
+ quiche::QuicheStringPiece headers_data));
MOCK_METHOD3(OnPromiseHeadersComplete,
void(QuicStreamId stream_id,
QuicStreamId promised_stream_id,
@@ -799,8 +802,8 @@
MOCK_METHOD0(CreateOutgoingBidirectionalStream, QuicSpdyStream*());
MOCK_METHOD0(CreateOutgoingUnidirectionalStream, QuicSpdyStream*());
MOCK_CONST_METHOD1(SelectAlpn,
- std::vector<QuicStringPiece>::const_iterator(
- const std::vector<QuicStringPiece>&));
+ std::vector<quiche::QuicheStringPiece>::const_iterator(
+ const std::vector<quiche::QuicheStringPiece>&));
QuicCryptoServerStreamBase* CreateQuicCryptoServerStream(
const QuicCryptoServerConfig* crypto_config,
QuicCompressedCertsCache* compressed_certs_cache) override;
@@ -1075,7 +1078,9 @@
void(const QuicVersionNegotiationPacket&));
MOCK_METHOD3(OnRetryPacket,
- void(QuicConnectionId, QuicConnectionId, QuicStringPiece));
+ void(QuicConnectionId,
+ QuicConnectionId,
+ quiche::QuicheStringPiece));
};
class MockReceivedPacketManager : public QuicReceivedPacketManager {
@@ -1213,7 +1218,7 @@
}
// Utility function that stores |str|'s data in |iov|.
-inline void MakeIOVector(QuicStringPiece str, struct iovec* iov) {
+inline void MakeIOVector(quiche::QuicheStringPiece str, struct iovec* iov) {
iov->iov_base = const_cast<char*>(str.data());
iov->iov_len = static_cast<size_t>(str.size());
}
@@ -1243,7 +1248,7 @@
// Utility function that stores message_data in |storage| and returns a
// QuicMemSliceSpan.
QuicMemSliceSpan MakeSpan(QuicBufferAllocator* allocator,
- QuicStringPiece message_data,
+ quiche::QuicheStringPiece message_data,
QuicMemSliceStorage* storage);
// Used to compare ReceivedPacketInfo.
@@ -1264,8 +1269,8 @@
// EXPECT_THAT(stream_->connection_error()), IsError(QUIC_INTERNAL_ERROR));
MATCHER_P(IsError,
expected,
- QuicStrCat(negation ? "isn't equal to " : "is equal to ",
- QuicErrorCodeToString(expected))) {
+ quiche::QuicheStrCat(negation ? "isn't equal to " : "is equal to ",
+ QuicErrorCodeToString(expected))) {
*result_listener << QuicErrorCodeToString(arg);
return arg == expected;
}
@@ -1273,8 +1278,8 @@
// Shorthand for IsError(QUIC_NO_ERROR).
// Example usage: EXPECT_THAT(stream_->connection_error(), IsQuicNoError());
MATCHER(IsQuicNoError,
- QuicStrCat(negation ? "isn't equal to " : "is equal to ",
- QuicErrorCodeToString(QUIC_NO_ERROR))) {
+ quiche::QuicheStrCat(negation ? "isn't equal to " : "is equal to ",
+ QuicErrorCodeToString(QUIC_NO_ERROR))) {
*result_listener << QuicErrorCodeToString(arg);
return arg == QUIC_NO_ERROR;
}
@@ -1284,8 +1289,8 @@
// EXPECT_THAT(stream_->stream_error(), IsStreamError(QUIC_INTERNAL_ERROR));
MATCHER_P(IsStreamError,
expected,
- QuicStrCat(negation ? "isn't equal to " : "is equal to ",
- QuicRstStreamErrorCodeToString(expected))) {
+ quiche::QuicheStrCat(negation ? "isn't equal to " : "is equal to ",
+ QuicRstStreamErrorCodeToString(expected))) {
*result_listener << QuicRstStreamErrorCodeToString(arg);
return arg == expected;
}
@@ -1293,8 +1298,9 @@
// Shorthand for IsStreamError(QUIC_STREAM_NO_ERROR). Example usage:
// EXPECT_THAT(stream_->stream_error(), IsQuicStreamNoError());
MATCHER(IsQuicStreamNoError,
- QuicStrCat(negation ? "isn't equal to " : "is equal to ",
- QuicRstStreamErrorCodeToString(QUIC_STREAM_NO_ERROR))) {
+ quiche::QuicheStrCat(
+ negation ? "isn't equal to " : "is equal to ",
+ QuicRstStreamErrorCodeToString(QUIC_STREAM_NO_ERROR))) {
*result_listener << QuicRstStreamErrorCodeToString(arg);
return arg == QUIC_STREAM_NO_ERROR;
}
