diff options
Diffstat (limited to 'chromium/net/third_party/quiche/src/http2/decoder/payload_decoders/payload_decoder_base_test_util.h')
| -rw-r--r-- | chromium/net/third_party/quiche/src/http2/decoder/payload_decoders/payload_decoder_base_test_util.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/chromium/net/third_party/quiche/src/http2/decoder/payload_decoders/payload_decoder_base_test_util.h b/chromium/net/third_party/quiche/src/http2/decoder/payload_decoders/payload_decoder_base_test_util.h index 8297e70dab4..66dd88a48c0 100644 --- a/chromium/net/third_party/quiche/src/http2/decoder/payload_decoders/payload_decoder_base_test_util.h +++ b/chromium/net/third_party/quiche/src/http2/decoder/payload_decoders/payload_decoder_base_test_util.h @@ -9,7 +9,6 @@ #include <stddef.h> -#include "base/logging.h" #include "testing/gtest/include/gtest/gtest.h" #include "net/third_party/quiche/src/http2/decoder/decode_buffer.h" #include "net/third_party/quiche/src/http2/decoder/decode_status.h" @@ -18,6 +17,7 @@ #include "net/third_party/quiche/src/http2/http2_constants.h" #include "net/third_party/quiche/src/http2/http2_constants_test_util.h" #include "net/third_party/quiche/src/http2/http2_structures.h" +#include "net/third_party/quiche/src/http2/platform/api/http2_logging.h" #include "net/third_party/quiche/src/http2/platform/api/http2_reconstruct_object.h" #include "net/third_party/quiche/src/http2/platform/api/http2_string.h" #include "net/third_party/quiche/src/http2/platform/api/http2_string_piece.h" @@ -55,7 +55,7 @@ class PayloadDecoderBaseTest : public RandomDecoderTest { void set_frame_header(const Http2FrameHeader& header) { EXPECT_EQ(0, InvalidFlagMaskForFrameType(header.type) & header.flags); if (!frame_header_is_set_ || frame_header_ != header) { - VLOG(2) << "set_frame_header: " << frame_header_; + HTTP2_VLOG(2) << "set_frame_header: " << frame_header_; } frame_header_ = header; frame_header_is_set_ = true; @@ -174,13 +174,14 @@ class AbstractPayloadDecoderTest : public PayloadDecoderBaseTest { // Start decoding the payload. DecodeStatus StartDecodingPayload(DecodeBuffer* db) override { - DVLOG(2) << "StartDecodingPayload, db->Remaining=" << db->Remaining(); + HTTP2_DVLOG(2) << "StartDecodingPayload, db->Remaining=" << db->Remaining(); return payload_decoder_.StartDecodingPayload(mutable_state(), db); } // Resume decoding the payload. DecodeStatus ResumeDecodingPayload(DecodeBuffer* db) override { - DVLOG(2) << "ResumeDecodingPayload, db->Remaining=" << db->Remaining(); + HTTP2_DVLOG(2) << "ResumeDecodingPayload, db->Remaining=" + << db->Remaining(); return payload_decoder_.ResumeDecodingPayload(mutable_state(), db); } @@ -220,8 +221,8 @@ class AbstractPayloadDecoderTest : public PayloadDecoderBaseTest { validator = [header, validator, this]( const DecodeBuffer& input, DecodeStatus status) -> ::testing::AssertionResult { - DVLOG(2) << "VerifyDetectsFrameSizeError validator; status=" << status - << "; input.Remaining=" << input.Remaining(); + HTTP2_DVLOG(2) << "VerifyDetectsFrameSizeError validator; status=" + << status << "; input.Remaining=" << input.Remaining(); VERIFY_EQ(DecodeStatus::kDecodeError, status); VERIFY_FALSE(listener_.IsInProgress()); VERIFY_EQ(1u, listener_.size()); @@ -277,7 +278,7 @@ class AbstractPayloadDecoderTest : public PayloadDecoderBaseTest { if (approve_size != nullptr && !approve_size(real_payload_size)) { continue; } - VLOG(1) << "real_payload_size=" << real_payload_size; + HTTP2_VLOG(1) << "real_payload_size=" << real_payload_size; uint8_t flags = required_flags | RandFlags(); Http2FrameBuilder fb; if (total_pad_length > 0) { @@ -343,7 +344,7 @@ class AbstractPaddablePayloadDecoderTest typedef typename Base::Validator Validator; AbstractPaddablePayloadDecoderTest() : total_pad_length_(GetParam()) { - LOG(INFO) << "total_pad_length_ = " << total_pad_length_; + HTTP2_LOG(INFO) << "total_pad_length_ = " << total_pad_length_; } // Note that total_pad_length_ includes the size of the Pad Length field, @@ -422,12 +423,12 @@ class AbstractPaddablePayloadDecoderTest if (IsPadded()) { fb.AppendUInt8(pad_length()); fb.AppendZeroes(pad_length()); - VLOG(1) << "fb.size=" << fb.size(); + HTTP2_VLOG(1) << "fb.size=" << fb.size(); // Pick a random length for the payload that is shorter than neccesary. payload_length = Random().Uniform(fb.size()); } - VLOG(1) << "payload_length=" << payload_length; + HTTP2_VLOG(1) << "payload_length=" << payload_length; Http2String payload = fb.buffer().substr(0, payload_length); // The missing length is the amount we cut off the end, unless @@ -435,7 +436,7 @@ class AbstractPaddablePayloadDecoderTest // byte, the Pad Length field, is missing. size_t missing_length = payload_length == 0 ? 1 : fb.size() - payload_length; - VLOG(1) << "missing_length=" << missing_length; + HTTP2_VLOG(1) << "missing_length=" << missing_length; const Http2FrameHeader header(payload_length, DecoderPeer::FrameType(), flags, RandStreamId()); |