Remove http2_flags.h and http2_flag_utils.h. Replace HTTP2_CODE_COUNT_N with QUICHE_CODE_COUNT_N These were the last bits of http2/platform/api, http2/platform is now gone! PiperOrigin-RevId: 445979757
diff --git a/quiche/http2/decoder/http2_frame_decoder.cc b/quiche/http2/decoder/http2_frame_decoder.cc index 0225d93..14b3430 100644 --- a/quiche/http2/decoder/http2_frame_decoder.cc +++ b/quiche/http2/decoder/http2_frame_decoder.cc
@@ -7,8 +7,6 @@ #include "quiche/http2/decoder/decode_status.h" #include "quiche/http2/hpack/varint/hpack_varint_decoder.h" #include "quiche/http2/http2_constants.h" -#include "quiche/http2/platform/api/http2_flag_utils.h" -#include "quiche/http2/platform/api/http2_flags.h" #include "quiche/common/platform/api/quiche_bug_tracker.h" #include "quiche/common/platform/api/quiche_logging.h"
diff --git a/quiche/http2/decoder/http2_frame_decoder_test.cc b/quiche/http2/decoder/http2_frame_decoder_test.cc index b05f7ae..3402f9b 100644 --- a/quiche/http2/decoder/http2_frame_decoder_test.cc +++ b/quiche/http2/decoder/http2_frame_decoder_test.cc
@@ -11,7 +11,6 @@ #include "absl/strings/string_view.h" #include "quiche/http2/http2_constants.h" -#include "quiche/http2/platform/api/http2_flags.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/test_tools/frame_parts_collector_listener.h" #include "quiche/http2/test_tools/http2_random.h"
diff --git a/quiche/http2/hpack/decoder/hpack_block_decoder.cc b/quiche/http2/hpack/decoder/hpack_block_decoder.cc index 5396142..f47c806 100644 --- a/quiche/http2/hpack/decoder/hpack_block_decoder.cc +++ b/quiche/http2/hpack/decoder/hpack_block_decoder.cc
@@ -7,8 +7,7 @@ #include <cstdint> #include "absl/strings/str_cat.h" -#include "quiche/http2/platform/api/http2_flag_utils.h" -#include "quiche/http2/platform/api/http2_flags.h" +#include "quiche/common/platform/api/quiche_flag_utils.h" #include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -26,7 +25,7 @@ QUICHE_DCHECK_EQ(0u, db->Remaining()); return DecodeStatus::kDecodeInProgress; case DecodeStatus::kDecodeError: - HTTP2_CODE_COUNT_N(decompress_failure_3, 1, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 1, 23); return DecodeStatus::kDecodeError; } } @@ -43,7 +42,7 @@ before_entry_ = false; return DecodeStatus::kDecodeInProgress; case DecodeStatus::kDecodeError: - HTTP2_CODE_COUNT_N(decompress_failure_3, 2, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 2, 23); return DecodeStatus::kDecodeError; } QUICHE_DCHECK(false);
diff --git a/quiche/http2/hpack/decoder/hpack_decoder.cc b/quiche/http2/hpack/decoder/hpack_decoder.cc index 04b321a..935cd7f 100644 --- a/quiche/http2/hpack/decoder/hpack_decoder.cc +++ b/quiche/http2/hpack/decoder/hpack_decoder.cc
@@ -5,8 +5,7 @@ #include "quiche/http2/hpack/decoder/hpack_decoder.h" #include "quiche/http2/decoder/decode_status.h" -#include "quiche/http2/platform/api/http2_flag_utils.h" -#include "quiche/http2/platform/api/http2_flags.h" +#include "quiche/common/platform/api/quiche_flag_utils.h" #include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -47,7 +46,7 @@ << (DetectError() ? "true" : "false") << ", size=" << db->Remaining(); if (DetectError()) { - HTTP2_CODE_COUNT_N(decompress_failure_3, 3, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 3, 23); return false; } // Decode contents of db as an HPACK block fragment, forwards the decoded @@ -56,10 +55,10 @@ DecodeStatus status = block_decoder_.Decode(db); if (status == DecodeStatus::kDecodeError) { ReportError(block_decoder_.error(), ""); - HTTP2_CODE_COUNT_N(decompress_failure_3, 4, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 4, 23); return false; } else if (DetectError()) { - HTTP2_CODE_COUNT_N(decompress_failure_3, 5, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 5, 23); return false; } // Should be positioned between entries iff decoding is complete. @@ -76,19 +75,19 @@ QUICHE_DVLOG(3) << "HpackDecoder::EndDecodingBlock, error_detected=" << (DetectError() ? "true" : "false"); if (DetectError()) { - HTTP2_CODE_COUNT_N(decompress_failure_3, 6, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 6, 23); return false; } if (!block_decoder_.before_entry()) { // The HPACK block ended in the middle of an entry. ReportError(HpackDecodingError::kTruncatedBlock, ""); - HTTP2_CODE_COUNT_N(decompress_failure_3, 7, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 7, 23); return false; } decoder_state_.OnHeaderBlockEnd(); if (DetectError()) { // HpackDecoderState will have reported the error. - HTTP2_CODE_COUNT_N(decompress_failure_3, 8, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 8, 23); return false; } return true; @@ -101,7 +100,7 @@ if (decoder_state_.error() != HpackDecodingError::kOk) { QUICHE_DVLOG(2) << "Error detected in decoder_state_"; - HTTP2_CODE_COUNT_N(decompress_failure_3, 10, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 10, 23); error_ = decoder_state_.error(); detailed_error_ = decoder_state_.detailed_error(); }
diff --git a/quiche/http2/hpack/decoder/hpack_entry_decoder.cc b/quiche/http2/hpack/decoder/hpack_entry_decoder.cc index 21a3b12..23ef25a 100644 --- a/quiche/http2/hpack/decoder/hpack_entry_decoder.cc +++ b/quiche/http2/hpack/decoder/hpack_entry_decoder.cc
@@ -9,9 +9,8 @@ #include <cstdint> #include "absl/base/macros.h" -#include "quiche/http2/platform/api/http2_flag_utils.h" -#include "quiche/http2/platform/api/http2_flags.h" #include "quiche/common/platform/api/quiche_bug_tracker.h" +#include "quiche/common/platform/api/quiche_flag_utils.h" #include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -80,7 +79,7 @@ state_ = EntryDecoderState::kResumeDecodingType; return status; case DecodeStatus::kDecodeError: - HTTP2_CODE_COUNT_N(decompress_failure_3, 11, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 11, 23); error_ = HpackDecodingError::kIndexVarintError; // The varint must have been invalid (too long). return status; @@ -105,7 +104,7 @@ << db->Remaining(); status = entry_type_decoder_.Resume(db); if (status == DecodeStatus::kDecodeError) { - HTTP2_CODE_COUNT_N(decompress_failure_3, 12, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 12, 23); error_ = HpackDecodingError::kIndexVarintError; } if (status != DecodeStatus::kDecodeDone) { @@ -138,7 +137,7 @@ // is too long. state_ = EntryDecoderState::kResumeDecodingName; if (status == DecodeStatus::kDecodeError) { - HTTP2_CODE_COUNT_N(decompress_failure_3, 13, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 13, 23); error_ = HpackDecodingError::kNameLengthVarintError; } return status; @@ -154,7 +153,7 @@ status = string_decoder_.Start(db, &vcb); } if (status == DecodeStatus::kDecodeError) { - HTTP2_CODE_COUNT_N(decompress_failure_3, 14, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 14, 23); error_ = HpackDecodingError::kValueLengthVarintError; } if (status == DecodeStatus::kDecodeDone) { @@ -184,7 +183,7 @@ // is too long. state_ = EntryDecoderState::kResumeDecodingName; if (status == DecodeStatus::kDecodeError) { - HTTP2_CODE_COUNT_N(decompress_failure_3, 15, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 15, 23); error_ = HpackDecodingError::kNameLengthVarintError; } return status; @@ -201,7 +200,7 @@ status = string_decoder_.Resume(db, &vcb); } if (status == DecodeStatus::kDecodeError) { - HTTP2_CODE_COUNT_N(decompress_failure_3, 16, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 16, 23); error_ = HpackDecodingError::kValueLengthVarintError; } if (status == DecodeStatus::kDecodeDone) {
diff --git a/quiche/http2/hpack/decoder/hpack_entry_type_decoder.cc b/quiche/http2/hpack/decoder/hpack_entry_type_decoder.cc index f49b508..e5694d4 100644 --- a/quiche/http2/hpack/decoder/hpack_entry_type_decoder.cc +++ b/quiche/http2/hpack/decoder/hpack_entry_type_decoder.cc
@@ -5,9 +5,8 @@ #include "quiche/http2/hpack/decoder/hpack_entry_type_decoder.h" #include "absl/strings/str_cat.h" -#include "quiche/http2/platform/api/http2_flag_utils.h" -#include "quiche/http2/platform/api/http2_flags.h" #include "quiche/common/platform/api/quiche_bug_tracker.h" +#include "quiche/common/platform/api/quiche_flag_utils.h" #include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -355,7 +354,7 @@ } QUICHE_BUG(http2_bug_66_1) << "Unreachable, byte=" << std::hex << static_cast<uint32_t>(byte); - HTTP2_CODE_COUNT_N(decompress_failure_3, 17, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 17, 23); return DecodeStatus::kDecodeError; }
diff --git a/quiche/http2/hpack/decoder/hpack_whole_entry_buffer.cc b/quiche/http2/hpack/decoder/hpack_whole_entry_buffer.cc index dbc0adb..8cf2e14 100644 --- a/quiche/http2/hpack/decoder/hpack_whole_entry_buffer.cc +++ b/quiche/http2/hpack/decoder/hpack_whole_entry_buffer.cc
@@ -5,8 +5,7 @@ #include "quiche/http2/hpack/decoder/hpack_whole_entry_buffer.h" #include "absl/strings/str_cat.h" -#include "quiche/http2/platform/api/http2_flag_utils.h" -#include "quiche/http2/platform/api/http2_flags.h" +#include "quiche/common/platform/api/quiche_flag_utils.h" #include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/quiche_text_utils.h" @@ -57,7 +56,7 @@ << ") is longer than permitted (" << max_string_size_bytes_ << ")"; ReportError(HpackDecodingError::kNameTooLong, ""); - HTTP2_CODE_COUNT_N(decompress_failure_3, 18, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 18, 23); return; } name_.OnStart(huffman_encoded, len); @@ -72,7 +71,7 @@ QUICHE_DCHECK_EQ(maybe_name_index_, 0u); if (!error_detected_ && !name_.OnData(data, len)) { ReportError(HpackDecodingError::kNameHuffmanError, ""); - HTTP2_CODE_COUNT_N(decompress_failure_3, 19, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 19, 23); } } @@ -81,7 +80,7 @@ QUICHE_DCHECK_EQ(maybe_name_index_, 0u); if (!error_detected_ && !name_.OnEnd()) { ReportError(HpackDecodingError::kNameHuffmanError, ""); - HTTP2_CODE_COUNT_N(decompress_failure_3, 20, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 20, 23); } } @@ -95,7 +94,7 @@ "] is longer than permitted (", max_string_size_bytes_, ")"); QUICHE_DVLOG(1) << detailed_error; ReportError(HpackDecodingError::kValueTooLong, detailed_error); - HTTP2_CODE_COUNT_N(decompress_failure_3, 21, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 21, 23); return; } value_.OnStart(huffman_encoded, len); @@ -109,7 +108,7 @@ absl::string_view(data, len)); if (!error_detected_ && !value_.OnData(data, len)) { ReportError(HpackDecodingError::kValueHuffmanError, ""); - HTTP2_CODE_COUNT_N(decompress_failure_3, 22, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 22, 23); } } @@ -120,7 +119,7 @@ } if (!value_.OnEnd()) { ReportError(HpackDecodingError::kValueHuffmanError, ""); - HTTP2_CODE_COUNT_N(decompress_failure_3, 23, 23); + QUICHE_CODE_COUNT_N(decompress_failure_3, 23, 23); return; } if (maybe_name_index_ == 0) {
diff --git a/quiche/http2/http2_constants.cc b/quiche/http2/http2_constants.cc index 34fe2dd..a4b6105 100644 --- a/quiche/http2/http2_constants.cc +++ b/quiche/http2/http2_constants.cc
@@ -7,7 +7,8 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" -#include "quiche/http2/platform/api/http2_flag_utils.h" +#include "quiche/common/platform/api/quiche_flag_utils.h" +#include "quiche/common/platform/api/quiche_flags.h" #include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -170,7 +171,7 @@ std::end(http2::kHttp2InvalidHeaderNamesOld)); return *invalid_header_set_old; } - HTTP2_RELOADABLE_FLAG_COUNT_N(quic_verify_request_headers_2, 3, 3); + QUICHE_RELOADABLE_FLAG_COUNT_N(quic_verify_request_headers_2, 3, 3); static const auto* invalid_header_set = new InvalidHeaderSet(std::begin(http2::kHttp2InvalidHeaderNames), std::end(http2::kHttp2InvalidHeaderNames));
diff --git a/quiche/http2/http2_constants.h b/quiche/http2/http2_constants.h index 35cb61f..6395cf1 100644 --- a/quiche/http2/http2_constants.h +++ b/quiche/http2/http2_constants.h
@@ -14,7 +14,6 @@ #include "absl/container/flat_hash_set.h" #include "absl/strings/string_view.h" -#include "quiche/http2/platform/api/http2_flags.h" #include "quiche/common/platform/api/quiche_export.h" #include "quiche/common/quiche_text_utils.h"
diff --git a/quiche/http2/platform/api/http2_flag_utils.h b/quiche/http2/platform/api/http2_flag_utils.h deleted file mode 100644 index 92cedb1..0000000 --- a/quiche/http2/platform/api/http2_flag_utils.h +++ /dev/null
@@ -1,19 +0,0 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef QUICHE_HTTP2_PLATFORM_API_HTTP2_FLAG_UTILS_H_ -#define QUICHE_HTTP2_PLATFORM_API_HTTP2_FLAG_UTILS_H_ - -#include "quiche/common/platform/api/quiche_flag_utils.h" - -#define HTTP2_RELOADABLE_FLAG_COUNT QUICHE_RELOADABLE_FLAG_COUNT -#define HTTP2_RELOADABLE_FLAG_COUNT_N QUICHE_RELOADABLE_FLAG_COUNT_N - -#define HTTP2_RESTART_FLAG_COUNT QUICHE_RESTART_FLAG_COUNT -#define HTTP2_RESTART_FLAG_COUNT_N QUICHE_RESTART_FLAG_COUNT_N - -#define HTTP2_CODE_COUNT QUICHE_CODE_COUNT -#define HTTP2_CODE_COUNT_N QUICHE_CODE_COUNT_N - -#endif // QUICHE_HTTP2_PLATFORM_API_HTTP2_FLAG_UTILS_H_
diff --git a/quiche/http2/platform/api/http2_flags.h b/quiche/http2/platform/api/http2_flags.h deleted file mode 100644 index 0f53f5a..0000000 --- a/quiche/http2/platform/api/http2_flags.h +++ /dev/null
@@ -1,19 +0,0 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef QUICHE_HTTP2_PLATFORM_API_HTTP2_FLAGS_H_ -#define QUICHE_HTTP2_PLATFORM_API_HTTP2_FLAGS_H_ - -#include "quiche/common/platform/api/quiche_flags.h" - -#define GetHttp2ReloadableFlag(flag) GetQuicheReloadableFlag(http2, flag) -#define SetHttp2ReloadableFlag(flag, value) \ - SetQuicheReloadableFlag(http2, flag, value) -#define GetHttp2RestartFlag(flag) GetQuicheRestartFlag(http2, flag) -#define SetHttp2RestartFlag(flag, value) \ - SetQuicheRestartFlag(http2, flag, value) -#define GetHttp2Flag(flag) GetQuicheFlag(flag) -#define SetHttp2Flag(flag, value) SetQuicheFlag(flag, value) - -#endif // QUICHE_HTTP2_PLATFORM_API_HTTP2_FLAGS_H_