Replace QuicheStringPiece with absl::string_view
PiperOrigin-RevId: 336342206
Change-Id: Ia210dcdb4a9f03829f62ce2494b82f600d19bfe5
diff --git a/quic/core/frames/quic_crypto_frame.cc b/quic/core/frames/quic_crypto_frame.cc
index bef5f28..e804f27 100644
--- a/quic/core/frames/quic_crypto_frame.cc
+++ b/quic/core/frames/quic_crypto_frame.cc
@@ -4,8 +4,8 @@
#include "net/third_party/quiche/src/quic/core/frames/quic_crypto_frame.h"
+#include "absl/strings/string_view.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_logging.h"
-#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace quic {
@@ -16,7 +16,7 @@
QuicCryptoFrame::QuicCryptoFrame(EncryptionLevel level,
QuicStreamOffset offset,
- quiche::QuicheStringPiece data)
+ absl::string_view data)
: QuicCryptoFrame(level, offset, data.data(), data.length()) {}
QuicCryptoFrame::QuicCryptoFrame(EncryptionLevel level,
diff --git a/quic/core/frames/quic_crypto_frame.h b/quic/core/frames/quic_crypto_frame.h
index 2bb7a08..a8f0fe3 100644
--- a/quic/core/frames/quic_crypto_frame.h
+++ b/quic/core/frames/quic_crypto_frame.h
@@ -8,10 +8,10 @@
#include <memory>
#include <ostream>
+#include "absl/strings/string_view.h"
#include "net/third_party/quiche/src/quic/core/quic_buffer_allocator.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/common/platform/api/quiche_string_piece.h"
namespace quic {
@@ -22,7 +22,7 @@
QuicPacketLength data_length);
QuicCryptoFrame(EncryptionLevel level,
QuicStreamOffset offset,
- quiche::QuicheStringPiece data);
+ absl::string_view data);
~QuicCryptoFrame();
friend QUIC_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& os,
diff --git a/quic/core/frames/quic_stream_frame.cc b/quic/core/frames/quic_stream_frame.cc
index db19999..728d320 100644
--- a/quic/core/frames/quic_stream_frame.cc
+++ b/quic/core/frames/quic_stream_frame.cc
@@ -4,8 +4,8 @@
#include "net/third_party/quiche/src/quic/core/frames/quic_stream_frame.h"
+#include "absl/strings/string_view.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_logging.h"
-#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace quic {
@@ -14,7 +14,7 @@
QuicStreamFrame::QuicStreamFrame(QuicStreamId stream_id,
bool fin,
QuicStreamOffset offset,
- quiche::QuicheStringPiece data)
+ absl::string_view data)
: QuicStreamFrame(stream_id, fin, offset, data.data(), data.length()) {}
QuicStreamFrame::QuicStreamFrame(QuicStreamId stream_id,
diff --git a/quic/core/frames/quic_stream_frame.h b/quic/core/frames/quic_stream_frame.h
index 10ad7db..32b2c74 100644
--- a/quic/core/frames/quic_stream_frame.h
+++ b/quic/core/frames/quic_stream_frame.h
@@ -8,11 +8,11 @@
#include <memory>
#include <ostream>
+#include "absl/strings/string_view.h"
#include "net/third_party/quiche/src/quic/core/frames/quic_inlined_frame.h"
#include "net/third_party/quiche/src/quic/core/quic_buffer_allocator.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/common/platform/api/quiche_string_piece.h"
namespace quic {
@@ -22,7 +22,7 @@
QuicStreamFrame(QuicStreamId stream_id,
bool fin,
QuicStreamOffset offset,
- quiche::QuicheStringPiece data);
+ absl::string_view data);
QuicStreamFrame(QuicStreamId stream_id,
bool fin,
QuicStreamOffset offset,
diff --git a/quic/core/qpack/fuzzer/qpack_decoder_fuzzer.cc b/quic/core/qpack/fuzzer/qpack_decoder_fuzzer.cc
index d5afa99..2139418 100644
--- a/quic/core/qpack/fuzzer/qpack_decoder_fuzzer.cc
+++ b/quic/core/qpack/fuzzer/qpack_decoder_fuzzer.cc
@@ -7,11 +7,11 @@
#include <limits>
#include <utility>
+#include "absl/strings/string_view.h"
#include "net/third_party/quiche/src/quic/core/qpack/qpack_decoder.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_fuzzed_data_provider.h"
#include "net/third_party/quiche/src/quic/test_tools/qpack/qpack_decoder_test_utils.h"
#include "net/third_party/quiche/src/quic/test_tools/qpack/qpack_test_utils.h"
-#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace quic {
namespace test {
@@ -30,8 +30,7 @@
ErrorDelegate(bool* error_detected) : error_detected_(error_detected) {}
~ErrorDelegate() override = default;
- void OnEncoderStreamError(
- quiche::QuicheStringPiece /*error_message*/) override {
+ void OnEncoderStreamError(absl::string_view /*error_message*/) override {
*error_detected_ = true;
}
@@ -51,8 +50,8 @@
error_detected_(error_detected) {}
~HeadersHandler() override = default;
- void OnHeaderDecoded(quiche::QuicheStringPiece /*name*/,
- quiche::QuicheStringPiece /*value*/) override {}
+ void OnHeaderDecoded(absl::string_view /*name*/,
+ absl::string_view /*value*/) override {}
// Remove DecoderAndHandler from |*processing_decoders|.
void OnDecodingCompleted() override {
@@ -61,8 +60,7 @@
CHECK_EQ(1u, result);
}
- void OnDecodingErrorDetected(
- quiche::QuicheStringPiece /*error_message*/) override {
+ void OnDecodingErrorDetected(absl::string_view /*error_message*/) override {
*error_detected_ = true;
}
diff --git a/quic/core/qpack/fuzzer/qpack_encoder_stream_receiver_fuzzer.cc b/quic/core/qpack/fuzzer/qpack_encoder_stream_receiver_fuzzer.cc
index 78467a8..ce2ef54 100644
--- a/quic/core/qpack/fuzzer/qpack_encoder_stream_receiver_fuzzer.cc
+++ b/quic/core/qpack/fuzzer/qpack_encoder_stream_receiver_fuzzer.cc
@@ -7,9 +7,9 @@
#include <cstddef>
#include <cstdint>
+#include "absl/strings/string_view.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_logging.h"
-#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace quic {
namespace test {
@@ -24,14 +24,12 @@
void OnInsertWithNameReference(bool /*is_static*/,
uint64_t /*name_index*/,
- quiche::QuicheStringPiece /*value*/) override {
- }
- void OnInsertWithoutNameReference(
- quiche::QuicheStringPiece /*name*/,
- quiche::QuicheStringPiece /*value*/) override {}
+ absl::string_view /*value*/) override {}
+ void OnInsertWithoutNameReference(absl::string_view /*name*/,
+ absl::string_view /*value*/) override {}
void OnDuplicate(uint64_t /*index*/) override {}
void OnSetDynamicTableCapacity(uint64_t /*capacity*/) override {}
- void OnErrorDetected(quiche::QuicheStringPiece /*error_message*/) override {
+ void OnErrorDetected(absl::string_view /*error_message*/) override {
error_detected_ = true;
}
diff --git a/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc b/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc
index 8c94f1e..c14add3 100644
--- a/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc
+++ b/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc
@@ -8,6 +8,7 @@
#include <string>
#include <utility>
+#include "absl/strings/string_view.h"
#include "net/third_party/quiche/src/quic/core/http/quic_header_list.h"
#include "net/third_party/quiche/src/quic/core/qpack/qpack_decoded_headers_accumulator.h"
#include "net/third_party/quiche/src/quic/core/qpack/qpack_decoder.h"
@@ -18,7 +19,6 @@
#include "net/third_party/quiche/src/quic/platform/api/quic_fuzzed_data_provider.h"
#include "net/third_party/quiche/src/quic/test_tools/qpack/qpack_decoder_test_utils.h"
#include "net/third_party/quiche/src/quic/test_tools/qpack/qpack_encoder_peer.h"
-#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
#include "net/third_party/quiche/src/spdy/core/spdy_header_block.h"
namespace quic {
@@ -64,8 +64,7 @@
public:
~CrashingDecoderStreamErrorDelegate() override = default;
- void OnDecoderStreamError(
- quiche::QuicheStringPiece error_message) override {
+ void OnDecoderStreamError(absl::string_view error_message) override {
CHECK(false) << error_message;
}
};
@@ -92,7 +91,7 @@
virtual void OnHeaderBlockStart(QuicStreamId stream_id) = 0;
// Called when part or all of a header block is transmitted.
virtual void OnHeaderBlockFragment(QuicStreamId stream_id,
- quiche::QuicheStringPiece data) = 0;
+ absl::string_view data) = 0;
// Called when transmission of a header block is complete.
virtual void OnHeaderBlockEnd(QuicStreamId stream_id) = 0;
};
@@ -205,19 +204,16 @@
size_t RemainingLength() const { return data_.length() - offset_; }
- quiche::QuicheStringPiece Consume(size_t length) {
+ absl::string_view Consume(size_t length) {
DCHECK_NE(0u, length);
DCHECK_LE(length, RemainingLength());
- quiche::QuicheStringPiece consumed =
- quiche::QuicheStringPiece(&data_[offset_], length);
+ absl::string_view consumed = absl::string_view(&data_[offset_], length);
offset_ += length;
return consumed;
}
- quiche::QuicheStringPiece ConsumeRemaining() {
- return Consume(RemainingLength());
- }
+ absl::string_view ConsumeRemaining() { return Consume(RemainingLength()); }
private:
// Complete header block.
@@ -279,11 +275,11 @@
visitor_->OnHeaderBlockDecoded(stream_id_);
}
- void OnHeaderDecodingError(quiche::QuicheStringPiece error_message) override {
+ void OnHeaderDecodingError(absl::string_view error_message) override {
CHECK(false) << error_message;
}
- void Decode(quiche::QuicheStringPiece data) { accumulator_.Decode(data); }
+ void Decode(absl::string_view data) { accumulator_.Decode(data); }
void EndHeaderBlock() { accumulator_.EndHeaderBlock(); }
@@ -362,7 +358,7 @@
}
void OnHeaderBlockFragment(QuicStreamId stream_id,
- quiche::QuicheStringPiece data) override {
+ absl::string_view data) override {
auto it = verifying_decoders_.find(stream_id);
CHECK(it != verifying_decoders_.end());
it->second->Decode(data);
@@ -381,8 +377,7 @@
public:
~CrashingEncoderStreamErrorDelegate() override = default;
- void OnEncoderStreamError(
- quiche::QuicheStringPiece error_message) override {
+ void OnEncoderStreamError(absl::string_view error_message) override {
CHECK(false) << error_message;
}
};
@@ -412,7 +407,7 @@
~DelayedStreamDataTransmitter() { CHECK(stream_data.empty()); }
// QpackStreamSenderDelegate implementation.
- void WriteStreamData(quiche::QuicheStringPiece data) override {
+ void WriteStreamData(absl::string_view data) override {
stream_data.push(std::string(data.data(), data.size()));
}
