Remove HTTP2_ARRAYSIZE; use QUICHE_ARRAYSIZE instead.
gfe-relnote: n/a, no functional change.
PiperOrigin-RevId: 285454609
Change-Id: Iddb4065449b26ddb6a194ba9409ab4e800cd0f86
diff --git a/http2/hpack/varint/hpack_varint_decoder_test.cc b/http2/hpack/varint/hpack_varint_decoder_test.cc
index 336349c..6a2cd23 100644
--- a/http2/hpack/varint/hpack_varint_decoder_test.cc
+++ b/http2/hpack/varint/hpack_varint_decoder_test.cc
@@ -9,10 +9,10 @@
#include <stddef.h>
#include "testing/gtest/include/gtest/gtest.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_arraysize.h"
#include "net/third_party/quiche/src/http2/platform/api/http2_logging.h"
#include "net/third_party/quiche/src/http2/platform/api/http2_string_utils.h"
#include "net/third_party/quiche/src/http2/tools/random_decoder_test.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_arraysize.h"
#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
using ::testing::AssertionFailure;
@@ -261,7 +261,7 @@
};
TEST_P(HpackVarintDecoderTest, Success) {
- for (size_t i = 0; i < HTTP2_ARRAYSIZE(kSuccessTestData); ++i) {
+ for (size_t i = 0; i < QUICHE_ARRAYSIZE(kSuccessTestData); ++i) {
DecodeExpectSuccess(Http2HexDecode(kSuccessTestData[i].data),
kSuccessTestData[i].prefix_length,
kSuccessTestData[i].expected_value);
@@ -302,7 +302,7 @@
{"ff80feffffffffffffff8100", 8}};
TEST_P(HpackVarintDecoderTest, Error) {
- for (size_t i = 0; i < HTTP2_ARRAYSIZE(kErrorTestData); ++i) {
+ for (size_t i = 0; i < QUICHE_ARRAYSIZE(kErrorTestData); ++i) {
DecodeExpectError(Http2HexDecode(kErrorTestData[i].data),
kErrorTestData[i].prefix_length);
}
diff --git a/http2/hpack/varint/hpack_varint_encoder_test.cc b/http2/hpack/varint/hpack_varint_encoder_test.cc
index 23c19c4..22de704 100644
--- a/http2/hpack/varint/hpack_varint_encoder_test.cc
+++ b/http2/hpack/varint/hpack_varint_encoder_test.cc
@@ -4,8 +4,8 @@
#include "net/third_party/quiche/src/http2/hpack/varint/hpack_varint_encoder.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_arraysize.h"
#include "net/third_party/quiche/src/http2/platform/api/http2_string_utils.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_arraysize.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -30,7 +30,7 @@
// Encode integers that fit in the prefix.
TEST(HpackVarintEncoderTest, Short) {
- for (size_t i = 0; i < HTTP2_ARRAYSIZE(kShortTestData); ++i) {
+ for (size_t i = 0; i < QUICHE_ARRAYSIZE(kShortTestData); ++i) {
std::string output;
HpackVarintEncoder::Encode(kShortTestData[i].high_bits,
kShortTestData[i].prefix_length,
@@ -103,17 +103,17 @@
TEST(HpackVarintEncoderTest, Long) {
// Test encoding byte by byte, also test encoding in
// a single ResumeEncoding() call.
- for (size_t i = 0; i < HTTP2_ARRAYSIZE(kLongTestData); ++i) {
- std::string expected_encoding =
- Http2HexDecode(kLongTestData[i].expected_encoding);
+ for (size_t i = 0; i < QUICHE_ARRAYSIZE(kLongTestData); ++i) {
+ std::string expected_encoding =
+ Http2HexDecode(kLongTestData[i].expected_encoding);
- std::string output;
- HpackVarintEncoder::Encode(kLongTestData[i].high_bits,
- kLongTestData[i].prefix_length,
- kLongTestData[i].value, &output);
+ std::string output;
+ HpackVarintEncoder::Encode(kLongTestData[i].high_bits,
+ kLongTestData[i].prefix_length,
+ kLongTestData[i].value, &output);
- EXPECT_EQ(expected_encoding, output);
- }
+ EXPECT_EQ(expected_encoding, output);
+ }
}
struct {
@@ -130,7 +130,7 @@
// Make sure that the encoder outputs the last byte even when it is zero. This
// happens exactly when encoding the value 2^prefix_length - 1.
TEST(HpackVarintEncoderTest, LastByteIsZero) {
- for (size_t i = 0; i < HTTP2_ARRAYSIZE(kLastByteIsZeroTestData); ++i) {
+ for (size_t i = 0; i < QUICHE_ARRAYSIZE(kLastByteIsZeroTestData); ++i) {
std::string output;
HpackVarintEncoder::Encode(kLastByteIsZeroTestData[i].high_bits,
kLastByteIsZeroTestData[i].prefix_length,
