clang-format third_party/http2 Generated by touching *.h and *.cc then running hg fix --whole. PiperOrigin-RevId: 442646006
diff --git a/quiche/http2/core/http2_trace_logging.cc b/quiche/http2/core/http2_trace_logging.cc index e21e5c4..f6eef16 100644 --- a/quiche/http2/core/http2_trace_logging.cc +++ b/quiche/http2/core/http2_trace_logging.cc
@@ -147,7 +147,7 @@ } void Http2TraceLogger::OnDataFrameHeader(SpdyStreamId stream_id, size_t length, - bool fin) { + bool fin) { HTTP2_TRACE_LOG(perspective_, is_enabled_) << "OnDataFrameHeader:" << FORMAT_ARG(connection_id_) << FORMAT_ARG(stream_id) << FORMAT_ARG(length) << FORMAT_ARG(fin); @@ -155,7 +155,7 @@ } void Http2TraceLogger::OnStreamFrameData(SpdyStreamId stream_id, - const char* data, size_t len) { + const char* data, size_t len) { HTTP2_TRACE_LOG(perspective_, is_enabled_) << "OnStreamFrameData:" << FORMAT_ARG(connection_id_) << FORMAT_ARG(stream_id) << FORMAT_ARG(len); @@ -209,7 +209,7 @@ } void Http2TraceLogger::OnRstStream(SpdyStreamId stream_id, - SpdyErrorCode error_code) { + SpdyErrorCode error_code) { HTTP2_TRACE_LOG(perspective_, is_enabled_) << "OnRstStream:" << FORMAT_ARG(connection_id_) << FORMAT_ARG(stream_id) << " error_code=" << spdy::ErrorCodeToString(error_code); @@ -245,7 +245,7 @@ } void Http2TraceLogger::OnGoAway(SpdyStreamId last_accepted_stream_id, - SpdyErrorCode error_code) { + SpdyErrorCode error_code) { HTTP2_TRACE_LOG(perspective_, is_enabled_) << "OnGoAway:" << FORMAT_ARG(connection_id_) << FORMAT_ARG(last_accepted_stream_id) @@ -258,8 +258,8 @@ } void Http2TraceLogger::OnHeaders(SpdyStreamId stream_id, bool has_priority, - int weight, SpdyStreamId parent_stream_id, - bool exclusive, bool fin, bool end) { + int weight, SpdyStreamId parent_stream_id, + bool exclusive, bool fin, bool end) { HTTP2_TRACE_LOG(perspective_, is_enabled_) << "OnHeaders:" << FORMAT_ARG(connection_id_) << FORMAT_ARG(stream_id) << FORMAT_ARG(has_priority) << FORMAT_INT_ARG(weight) @@ -270,7 +270,7 @@ } void Http2TraceLogger::OnWindowUpdate(SpdyStreamId stream_id, - int delta_window_size) { + int delta_window_size) { HTTP2_TRACE_LOG(perspective_, is_enabled_) << "OnWindowUpdate:" << FORMAT_ARG(connection_id_) << FORMAT_ARG(stream_id) << FORMAT_ARG(delta_window_size); @@ -278,7 +278,8 @@ } void Http2TraceLogger::OnPushPromise(SpdyStreamId original_stream_id, - SpdyStreamId promised_stream_id, bool end) { + SpdyStreamId promised_stream_id, + bool end) { HTTP2_TRACE_LOG(perspective_, is_enabled_) << "OnPushPromise:" << FORMAT_ARG(connection_id_) << FORMAT_ARG(original_stream_id) << FORMAT_ARG(promised_stream_id) @@ -304,8 +305,8 @@ } void Http2TraceLogger::OnPriority(SpdyStreamId stream_id, - SpdyStreamId parent_stream_id, int weight, - bool exclusive) { + SpdyStreamId parent_stream_id, int weight, + bool exclusive) { HTTP2_TRACE_LOG(perspective_, is_enabled_) << "OnPriority:" << FORMAT_ARG(connection_id_) << FORMAT_ARG(stream_id) << FORMAT_ARG(parent_stream_id) << FORMAT_INT_ARG(weight) @@ -323,7 +324,7 @@ } bool Http2TraceLogger::OnUnknownFrame(SpdyStreamId stream_id, - uint8_t frame_type) { + uint8_t frame_type) { HTTP2_TRACE_LOG(perspective_, is_enabled_) << "OnUnknownFrame:" << FORMAT_ARG(connection_id_) << FORMAT_ARG(stream_id) << FORMAT_INT_ARG(frame_type);
diff --git a/quiche/http2/core/write_scheduler.h b/quiche/http2/core/write_scheduler.h index 7b68694..6086672 100644 --- a/quiche/http2/core/write_scheduler.h +++ b/quiche/http2/core/write_scheduler.h
@@ -73,8 +73,7 @@ // Preconditions: |stream_id| should be unregistered, and // |precedence.parent_id()| should be registered or |kHttp2RootStreamId|. virtual void UpdateStreamPrecedence( - StreamIdType stream_id, - const StreamPrecedenceType& precedence) = 0; + StreamIdType stream_id, const StreamPrecedenceType& precedence) = 0; // Returns child streams of the given stream, if any. If the scheduler // doesn't support stream dependencies, returns an empty vector.
diff --git a/quiche/http2/decoder/http2_frame_decoder.cc b/quiche/http2/decoder/http2_frame_decoder.cc index 8daa81d..aac3ef8 100644 --- a/quiche/http2/decoder/http2_frame_decoder.cc +++ b/quiche/http2/decoder/http2_frame_decoder.cc
@@ -258,9 +258,7 @@ // Clear all of the flags in the frame header; for use with frame types that // don't define any flags, such as WINDOW_UPDATE. -void Http2FrameDecoder::ClearFlags() { - frame_decoder_state_.ClearFlags(); -} +void Http2FrameDecoder::ClearFlags() { frame_decoder_state_.ClearFlags(); } DecodeStatus Http2FrameDecoder::StartDecodingAltSvcPayload(DecodeBuffer* db) { ClearFlags();
diff --git a/quiche/http2/decoder/http2_frame_decoder_listener.h b/quiche/http2/decoder/http2_frame_decoder_listener.h index 13f1784..a6839ab 100644 --- a/quiche/http2/decoder/http2_frame_decoder_listener.h +++ b/quiche/http2/decoder/http2_frame_decoder_listener.h
@@ -233,8 +233,7 @@ // OnAltSvcEnd will called last, after all of the origin and // Alt-Svc-Field-Value have been delivered to the listener. virtual void OnAltSvcStart(const Http2FrameHeader& header, - size_t origin_length, - size_t value_length) = 0; + size_t origin_length, size_t value_length) = 0; // Called when decoding the (optional) origin of an ALTSVC; // the field is uninterpreted.
diff --git a/quiche/http2/decoder/http2_frame_decoder_listener_test_util.cc b/quiche/http2/decoder/http2_frame_decoder_listener_test_util.cc index a0b7ea8..debec83 100644 --- a/quiche/http2/decoder/http2_frame_decoder_listener_test_util.cc +++ b/quiche/http2/decoder/http2_frame_decoder_listener_test_util.cc
@@ -31,9 +31,7 @@ FAIL() << "OnDataPayload: len=" << len; } -void FailingHttp2FrameDecoderListener::OnDataEnd() { - FAIL() << "OnDataEnd"; -} +void FailingHttp2FrameDecoderListener::OnDataEnd() { FAIL() << "OnDataEnd"; } void FailingHttp2FrameDecoderListener::OnHeadersStart( const Http2FrameHeader& header) { @@ -55,8 +53,7 @@ } void FailingHttp2FrameDecoderListener::OnPriorityFrame( - const Http2FrameHeader& header, - const Http2PriorityFields& priority) { + const Http2FrameHeader& header, const Http2PriorityFields& priority) { FAIL() << "OnPriorityFrame: " << header << "; priority: " << priority; } @@ -79,8 +76,7 @@ } void FailingHttp2FrameDecoderListener::OnRstStream( - const Http2FrameHeader& header, - Http2ErrorCode error_code) { + const Http2FrameHeader& header, Http2ErrorCode error_code) { FAIL() << "OnRstStream: " << header << "; code=" << error_code; } @@ -104,8 +100,7 @@ } void FailingHttp2FrameDecoderListener::OnPushPromiseStart( - const Http2FrameHeader& header, - const Http2PushPromiseFields& promise, + const Http2FrameHeader& header, const Http2PushPromiseFields& promise, size_t total_padding_length) { FAIL() << "OnPushPromiseStart: " << header << "; promise: " << promise << "; total_padding_length: " << total_padding_length; @@ -126,8 +121,7 @@ } void FailingHttp2FrameDecoderListener::OnGoAwayStart( - const Http2FrameHeader& header, - const Http2GoAwayFields& goaway) { + const Http2FrameHeader& header, const Http2GoAwayFields& goaway) { FAIL() << "OnGoAwayStart: " << header << "; goaway: " << goaway; } @@ -141,15 +135,12 @@ } void FailingHttp2FrameDecoderListener::OnWindowUpdate( - const Http2FrameHeader& header, - uint32_t increment) { + const Http2FrameHeader& header, uint32_t increment) { FAIL() << "OnWindowUpdate: " << header << "; increment=" << increment; } void FailingHttp2FrameDecoderListener::OnAltSvcStart( - const Http2FrameHeader& header, - size_t origin_length, - size_t value_length) { + const Http2FrameHeader& header, size_t origin_length, size_t value_length) { FAIL() << "OnAltSvcStart: " << header << "; origin_length: " << origin_length << "; value_length: " << value_length; } @@ -176,8 +167,7 @@ } void FailingHttp2FrameDecoderListener::OnPriorityUpdatePayload( - const char* /*data*/, - size_t len) { + const char* /*data*/, size_t len) { FAIL() << "OnPriorityUpdatePayload: len=" << len; } @@ -200,8 +190,7 @@ } void FailingHttp2FrameDecoderListener::OnPaddingTooLong( - const Http2FrameHeader& header, - size_t missing_length) { + const Http2FrameHeader& header, size_t missing_length) { FAIL() << "OnPaddingTooLong: " << header << "; missing_length: " << missing_length; } @@ -282,8 +271,7 @@ } void LoggingHttp2FrameDecoderListener::OnPriorityFrame( - const Http2FrameHeader& header, - const Http2PriorityFields& priority) { + const Http2FrameHeader& header, const Http2PriorityFields& priority) { HTTP2_VLOG(1) << "OnPriorityFrame: " << header << "; priority: " << priority; if (wrapped_ != nullptr) { wrapped_->OnPriorityFrame(header, priority); @@ -321,8 +309,7 @@ } void LoggingHttp2FrameDecoderListener::OnRstStream( - const Http2FrameHeader& header, - Http2ErrorCode error_code) { + const Http2FrameHeader& header, Http2ErrorCode error_code) { HTTP2_VLOG(1) << "OnRstStream: " << header << "; code=" << error_code; if (wrapped_ != nullptr) { wrapped_->OnRstStream(header, error_code); @@ -361,8 +348,7 @@ } void LoggingHttp2FrameDecoderListener::OnPushPromiseStart( - const Http2FrameHeader& header, - const Http2PushPromiseFields& promise, + const Http2FrameHeader& header, const Http2PushPromiseFields& promise, size_t total_padding_length) { HTTP2_VLOG(1) << "OnPushPromiseStart: " << header << "; promise: " << promise << "; total_padding_length: " << total_padding_length; @@ -395,8 +381,7 @@ } void LoggingHttp2FrameDecoderListener::OnGoAwayStart( - const Http2FrameHeader& header, - const Http2GoAwayFields& goaway) { + const Http2FrameHeader& header, const Http2GoAwayFields& goaway) { HTTP2_VLOG(1) << "OnGoAwayStart: " << header << "; goaway: " << goaway; if (wrapped_ != nullptr) { wrapped_->OnGoAwayStart(header, goaway); @@ -419,8 +404,7 @@ } void LoggingHttp2FrameDecoderListener::OnWindowUpdate( - const Http2FrameHeader& header, - uint32_t increment) { + const Http2FrameHeader& header, uint32_t increment) { HTTP2_VLOG(1) << "OnWindowUpdate: " << header << "; increment=" << increment; if (wrapped_ != nullptr) { wrapped_->OnWindowUpdate(header, increment); @@ -428,9 +412,7 @@ } void LoggingHttp2FrameDecoderListener::OnAltSvcStart( - const Http2FrameHeader& header, - size_t origin_length, - size_t value_length) { + const Http2FrameHeader& header, size_t origin_length, size_t value_length) { HTTP2_VLOG(1) << "OnAltSvcStart: " << header << "; origin_length: " << origin_length << "; value_length: " << value_length; @@ -510,8 +492,7 @@ } void LoggingHttp2FrameDecoderListener::OnPaddingTooLong( - const Http2FrameHeader& header, - size_t missing_length) { + const Http2FrameHeader& header, size_t missing_length) { HTTP2_VLOG(1) << "OnPaddingTooLong: " << header << "; missing_length: " << missing_length; if (wrapped_ != nullptr) {
diff --git a/quiche/http2/decoder/http2_frame_decoder_listener_test_util.h b/quiche/http2/decoder/http2_frame_decoder_listener_test_util.h index 86beb04..836293e 100644 --- a/quiche/http2/decoder/http2_frame_decoder_listener_test_util.h +++ b/quiche/http2/decoder/http2_frame_decoder_listener_test_util.h
@@ -60,8 +60,7 @@ void OnGoAwayEnd() override; void OnWindowUpdate(const Http2FrameHeader& header, uint32_t increment) override; - void OnAltSvcStart(const Http2FrameHeader& header, - size_t origin_length, + void OnAltSvcStart(const Http2FrameHeader& header, size_t origin_length, size_t value_length) override; void OnAltSvcOriginData(const char* data, size_t len) override; void OnAltSvcValueData(const char* data, size_t len) override; @@ -127,8 +126,7 @@ void OnGoAwayEnd() override; void OnWindowUpdate(const Http2FrameHeader& header, uint32_t increment) override; - void OnAltSvcStart(const Http2FrameHeader& header, - size_t origin_length, + void OnAltSvcStart(const Http2FrameHeader& header, size_t origin_length, size_t value_length) override; void OnAltSvcOriginData(const char* data, size_t len) override; void OnAltSvcValueData(const char* data, size_t len) override;
diff --git a/quiche/http2/decoder/http2_frame_decoder_test.cc b/quiche/http2/decoder/http2_frame_decoder_test.cc index 411f46e..783adb8 100644 --- a/quiche/http2/decoder/http2_frame_decoder_test.cc +++ b/quiche/http2/decoder/http2_frame_decoder_test.cc
@@ -112,8 +112,7 @@ // payload will be decoded several times with different partitionings // of the payload, and after each the validator will be called. AssertionResult DecodePayloadAndValidateSeveralWays( - absl::string_view payload, - const FrameParts& expected) { + absl::string_view payload, const FrameParts& expected) { auto validator = [&expected, this](const DecodeBuffer& /*input*/, DecodeStatus status) -> AssertionResult { VERIFY_EQ(status, DecodeStatus::kDecodeDone); @@ -141,16 +140,14 @@ template <size_t N> AssertionResult DecodePayloadAndValidateSeveralWays( - const char (&buf)[N], - const FrameParts& expected) { + const char (&buf)[N], const FrameParts& expected) { return DecodePayloadAndValidateSeveralWays(absl::string_view(buf, N), expected); } template <size_t N> AssertionResult DecodePayloadAndValidateSeveralWays( - const char (&buf)[N], - const Http2FrameHeader& header) { + const char (&buf)[N], const Http2FrameHeader& header) { return DecodePayloadAndValidateSeveralWays(absl::string_view(buf, N), FrameParts(header)); } @@ -180,8 +177,7 @@ template <size_t N> AssertionResult DecodePayloadExpectingFrameSizeError( - const char (&buf)[N], - const Http2FrameHeader& header) { + const char (&buf)[N], const Http2FrameHeader& header) { return DecodePayloadExpectingFrameSizeError(buf, FrameParts(header)); }
diff --git a/quiche/http2/decoder/http2_structure_decoder.h b/quiche/http2/decoder/http2_structure_decoder.h index 648ec32..12a8abb 100644 --- a/quiche/http2/decoder/http2_structure_decoder.h +++ b/quiche/http2/decoder/http2_structure_decoder.h
@@ -114,13 +114,11 @@ friend class test::Http2StructureDecoderPeer; uint32_t IncompleteStart(DecodeBuffer* db, uint32_t target_size); - DecodeStatus IncompleteStart(DecodeBuffer* db, - uint32_t* remaining_payload, + DecodeStatus IncompleteStart(DecodeBuffer* db, uint32_t* remaining_payload, uint32_t target_size); bool ResumeFillingBuffer(DecodeBuffer* db, uint32_t target_size); - bool ResumeFillingBuffer(DecodeBuffer* db, - uint32_t* remaining_payload, + bool ResumeFillingBuffer(DecodeBuffer* db, uint32_t* remaining_payload, uint32_t target_size); uint32_t offset_;
diff --git a/quiche/http2/hpack/huffman/hpack_huffman_decoder.cc b/quiche/http2/hpack/huffman/hpack_huffman_decoder.cc index 6a026a4..92afdc2 100644 --- a/quiche/http2/hpack/huffman/hpack_huffman_decoder.cc +++ b/quiche/http2/hpack/huffman/hpack_huffman_decoder.cc
@@ -345,9 +345,7 @@ } // namespace -HuffmanBitBuffer::HuffmanBitBuffer() { - Reset(); -} +HuffmanBitBuffer::HuffmanBitBuffer() { Reset(); } void HuffmanBitBuffer::Reset() { accumulator_ = 0;
diff --git a/quiche/http2/hpack/huffman/hpack_huffman_encoder.cc b/quiche/http2/hpack/huffman/hpack_huffman_encoder.cc index b5e3404..15b94a7 100644 --- a/quiche/http2/hpack/huffman/hpack_huffman_encoder.cc +++ b/quiche/http2/hpack/huffman/hpack_huffman_encoder.cc
@@ -17,8 +17,7 @@ return (bits + 7) / 8; } -void HuffmanEncode(absl::string_view plain, - size_t encoded_size, +void HuffmanEncode(absl::string_view plain, size_t encoded_size, std::string* huffman) { QUICHE_DCHECK(huffman != nullptr); huffman->reserve(huffman->size() + encoded_size); @@ -65,8 +64,7 @@ } } -void HuffmanEncodeFast(absl::string_view input, - size_t encoded_size, +void HuffmanEncodeFast(absl::string_view input, size_t encoded_size, std::string* output) { const size_t original_size = output->size(); const size_t final_size = original_size + encoded_size;
diff --git a/quiche/http2/hpack/huffman/hpack_huffman_encoder_test.cc b/quiche/http2/hpack/huffman/hpack_huffman_encoder_test.cc index a670b03..15ee375 100644 --- a/quiche/http2/hpack/huffman/hpack_huffman_encoder_test.cc +++ b/quiche/http2/hpack/huffman/hpack_huffman_encoder_test.cc
@@ -16,8 +16,7 @@ HuffmanEncoderTest() : use_fast_encoder_(GetParam()) {} virtual ~HuffmanEncoderTest() = default; - void Encode(absl::string_view input, - size_t encoded_size, + void Encode(absl::string_view input, size_t encoded_size, std::string* output) { use_fast_encoder_ ? HuffmanEncodeFast(input, encoded_size, output) : HuffmanEncode(input, encoded_size, output);
diff --git a/quiche/http2/hpack/huffman/hpack_huffman_transcoder_test.cc b/quiche/http2/hpack/huffman/hpack_huffman_transcoder_test.cc index 8d57ec9..cf4dab2 100644 --- a/quiche/http2/hpack/huffman/hpack_huffman_transcoder_test.cc +++ b/quiche/http2/hpack/huffman/hpack_huffman_transcoder_test.cc
@@ -72,8 +72,7 @@ } AssertionResult TranscodeAndValidateSeveralWays( - absl::string_view plain, - absl::string_view expected_huffman) { + absl::string_view plain, absl::string_view expected_huffman) { size_t encoded_size = HuffmanSize(plain); std::string encoded; HuffmanEncode(plain, encoded_size, &encoded);
diff --git a/quiche/http2/hpack/huffman/huffman_spec_tables.cc b/quiche/http2/hpack/huffman/huffman_spec_tables.cc index f4b103b..c8251cf 100644 --- a/quiche/http2/hpack/huffman/huffman_spec_tables.cc +++ b/quiche/http2/hpack/huffman/huffman_spec_tables.cc
@@ -570,3 +570,4 @@ // clang-format off } // namespace http2 +
diff --git a/quiche/http2/http2_structures.h b/quiche/http2/http2_structures.h index 1daba75..49d55b5 100644 --- a/quiche/http2/http2_structures.h +++ b/quiche/http2/http2_structures.h
@@ -140,8 +140,7 @@ struct QUICHE_EXPORT_PRIVATE Http2PriorityFields { Http2PriorityFields() {} - Http2PriorityFields(uint32_t stream_dependency, - uint32_t weight, + Http2PriorityFields(uint32_t stream_dependency, uint32_t weight, bool is_exclusive) : stream_dependency(stream_dependency), weight(weight), @@ -299,8 +298,7 @@ return !(a == b); } QUICHE_EXPORT_PRIVATE std::ostream& operator<<( - std::ostream& out, - const Http2WindowUpdateFields& v); + std::ostream& out, const Http2WindowUpdateFields& v); // Http2AltSvcFields: @@ -338,13 +336,11 @@ QUICHE_EXPORT_PRIVATE bool operator==(const Http2PriorityUpdateFields& a, const Http2PriorityUpdateFields& b); QUICHE_EXPORT_PRIVATE inline bool operator!=( - const Http2PriorityUpdateFields& a, - const Http2PriorityUpdateFields& b) { + const Http2PriorityUpdateFields& a, const Http2PriorityUpdateFields& b) { return !(a == b); } QUICHE_EXPORT_PRIVATE std::ostream& operator<<( - std::ostream& out, - const Http2PriorityUpdateFields& v); + std::ostream& out, const Http2PriorityUpdateFields& v); } // namespace http2
diff --git a/quiche/http2/http2_structures_test.cc b/quiche/http2/http2_structures_test.cc index 9fae635..2483837 100644 --- a/quiche/http2/http2_structures_test.cc +++ b/quiche/http2/http2_structures_test.cc
@@ -165,8 +165,7 @@ }; class IsEndStreamTest : public Http2FrameHeaderTypeAndFlagTest {}; -INSTANTIATE_TEST_SUITE_P(IsEndStream, - IsEndStreamTest, +INSTANTIATE_TEST_SUITE_P(IsEndStream, IsEndStreamTest, Combine(ValuesIn(ValidFrameTypes()), Values(~Http2FrameFlag::END_STREAM, 0xff))); TEST_P(IsEndStreamTest, IsEndStream) { @@ -203,8 +202,7 @@ } class IsACKTest : public Http2FrameHeaderTypeAndFlagTest {}; -INSTANTIATE_TEST_SUITE_P(IsAck, - IsACKTest, +INSTANTIATE_TEST_SUITE_P(IsAck, IsACKTest, Combine(ValuesIn(ValidFrameTypes()), Values(~Http2FrameFlag::ACK, 0xff))); TEST_P(IsACKTest, IsAck) { @@ -240,8 +238,7 @@ } class IsEndHeadersTest : public Http2FrameHeaderTypeAndFlagTest {}; -INSTANTIATE_TEST_SUITE_P(IsEndHeaders, - IsEndHeadersTest, +INSTANTIATE_TEST_SUITE_P(IsEndHeaders, IsEndHeadersTest, Combine(ValuesIn(ValidFrameTypes()), Values(~Http2FrameFlag::END_HEADERS, 0xff))); TEST_P(IsEndHeadersTest, IsEndHeaders) { @@ -281,8 +278,7 @@ } class IsPaddedTest : public Http2FrameHeaderTypeAndFlagTest {}; -INSTANTIATE_TEST_SUITE_P(IsPadded, - IsPaddedTest, +INSTANTIATE_TEST_SUITE_P(IsPadded, IsPaddedTest, Combine(ValuesIn(ValidFrameTypes()), Values(~Http2FrameFlag::PADDED, 0xff))); TEST_P(IsPaddedTest, IsPadded) { @@ -320,8 +316,7 @@ } class HasPriorityTest : public Http2FrameHeaderTypeAndFlagTest {}; -INSTANTIATE_TEST_SUITE_P(HasPriority, - HasPriorityTest, +INSTANTIATE_TEST_SUITE_P(HasPriority, HasPriorityTest, Combine(ValuesIn(ValidFrameTypes()), Values(~Http2FrameFlag::PRIORITY, 0xff))); TEST_P(HasPriorityTest, HasPriority) {
diff --git a/quiche/http2/test_tools/frame_parts.cc b/quiche/http2/test_tools/frame_parts.cc index 90db520..14302d9 100644 --- a/quiche/http2/test_tools/frame_parts.cc +++ b/quiche/http2/test_tools/frame_parts.cc
@@ -58,8 +58,7 @@ opt_payload_length_ = payload.size(); } FrameParts::FrameParts(const Http2FrameHeader& header, - absl::string_view payload, - size_t total_pad_length) + absl::string_view payload, size_t total_pad_length) : FrameParts(header, payload) { HTTP2_VLOG(1) << "FrameParts with total_pad_length=" << total_pad_length; SetTotalPadLength(total_pad_length); @@ -334,8 +333,7 @@ } void FrameParts::OnAltSvcStart(const Http2FrameHeader& header, - size_t origin_length, - size_t value_length) { + size_t origin_length, size_t value_length) { HTTP2_VLOG(1) << "OnAltSvcStart: " << header << " origin_length: " << origin_length << " value_length: " << value_length; @@ -505,8 +503,7 @@ } AssertionResult FrameParts::StartFrameOfType( - const Http2FrameHeader& header, - Http2FrameType expected_frame_type) { + const Http2FrameHeader& header, Http2FrameType expected_frame_type) { VERIFY_EQ(header.type, expected_frame_type); VERIFY_FALSE(got_start_callback_); VERIFY_FALSE(got_end_callback_);
diff --git a/quiche/http2/test_tools/frame_parts.h b/quiche/http2/test_tools/frame_parts.h index ab357ac..a9abe90 100644 --- a/quiche/http2/test_tools/frame_parts.h +++ b/quiche/http2/test_tools/frame_parts.h
@@ -39,8 +39,7 @@ // For use in tests where the expected frame has a variable size payload // and may be padded. - FrameParts(const Http2FrameHeader& header, - absl::string_view payload, + FrameParts(const Http2FrameHeader& header, absl::string_view payload, size_t total_pad_length); // Copy constructor. @@ -96,8 +95,7 @@ void OnGoAwayEnd() override; void OnWindowUpdate(const Http2FrameHeader& header, uint32_t increment) override; - void OnAltSvcStart(const Http2FrameHeader& header, - size_t origin_length, + void OnAltSvcStart(const Http2FrameHeader& header, size_t origin_length, size_t value_length) override; void OnAltSvcOriginData(const char* data, size_t len) override; void OnAltSvcValueData(const char* data, size_t len) override; @@ -200,8 +198,7 @@ // expected_frame_type, and have not already received other On* methods // (i.e. got_start_callback is false). ::testing::AssertionResult StartFrameOfType( - const Http2FrameHeader& header, - Http2FrameType expected_frame_type); + const Http2FrameHeader& header, Http2FrameType expected_frame_type); // ASSERT that StartFrameOfType has already been called with // expected_frame_type (i.e. got_start_callback has been called), and that
diff --git a/quiche/http2/test_tools/frame_parts_collector_listener.cc b/quiche/http2/test_tools/frame_parts_collector_listener.cc index d03e026..f5f9061 100644 --- a/quiche/http2/test_tools/frame_parts_collector_listener.cc +++ b/quiche/http2/test_tools/frame_parts_collector_listener.cc
@@ -116,8 +116,7 @@ } void FramePartsCollectorListener::OnPushPromiseStart( - const Http2FrameHeader& header, - const Http2PushPromiseFields& promise, + const Http2FrameHeader& header, const Http2PushPromiseFields& promise, size_t total_padding_length) { HTTP2_VLOG(1) << "OnPushPromiseStart header: " << header << " promise: " << promise @@ -144,8 +143,7 @@ } void FramePartsCollectorListener::OnGoAwayStart( - const Http2FrameHeader& header, - const Http2GoAwayFields& goaway) { + const Http2FrameHeader& header, const Http2GoAwayFields& goaway) { HTTP2_VLOG(1) << "OnGoAwayStart header: " << header << "; goaway: " << goaway; StartFrame(header)->OnGoAwayStart(header, goaway); } @@ -162,8 +160,7 @@ } void FramePartsCollectorListener::OnWindowUpdate( - const Http2FrameHeader& header, - uint32_t window_size_increment) { + const Http2FrameHeader& header, uint32_t window_size_increment) { HTTP2_VLOG(1) << "OnWindowUpdate: " << header << "; window_size_increment=" << window_size_increment; EXPECT_EQ(Http2FrameType::WINDOW_UPDATE, header.type); @@ -233,8 +230,7 @@ } void FramePartsCollectorListener::OnPaddingTooLong( - const Http2FrameHeader& header, - size_t missing_length) { + const Http2FrameHeader& header, size_t missing_length) { HTTP2_VLOG(1) << "OnPaddingTooLong: " << header << " missing_length: " << missing_length; EndFrame()->OnPaddingTooLong(header, missing_length);
diff --git a/quiche/http2/test_tools/frame_parts_collector_listener.h b/quiche/http2/test_tools/frame_parts_collector_listener.h index 538c8f4..a7412d4 100644 --- a/quiche/http2/test_tools/frame_parts_collector_listener.h +++ b/quiche/http2/test_tools/frame_parts_collector_listener.h
@@ -67,8 +67,7 @@ void OnGoAwayEnd() override; void OnWindowUpdate(const Http2FrameHeader& header, uint32_t window_size_increment) override; - void OnAltSvcStart(const Http2FrameHeader& header, - size_t origin_length, + void OnAltSvcStart(const Http2FrameHeader& header, size_t origin_length, size_t value_length) override; void OnAltSvcOriginData(const char* data, size_t len) override; void OnAltSvcValueData(const char* data, size_t len) override;