commit f0d86a1a9ff0518f267e4a94833a86a0771dc99c
author bnc <bnc@google.com> Fri Dec 13 12:58:44 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Fri Dec 13 12:59:17 2019 -0800
tree 5244c5aa14c8a0aa794adca814752ba1ba6b4980
parent 404c3a763d976e8c92a08380d20200c3b3fcf7c8

Remove HTTP2_ARRAYSIZE; use QUICHE_ARRAYSIZE instead.

gfe-relnote: n/a, no functional change.
PiperOrigin-RevId: 285454609
Change-Id: Iddb4065449b26ddb6a194ba9409ab4e800cd0f86

http2/hpack/huffman/hpack_huffman_encoder_test.cc

diff --git a/http2/hpack/huffman/hpack_huffman_encoder_test.cc b/http2/hpack/huffman/hpack_huffman_encoder_test.cc
index 24d3cf1..d729d0e 100644
--- a/http2/hpack/huffman/hpack_huffman_encoder_test.cc
+++ b/http2/hpack/huffman/hpack_huffman_encoder_test.cc
@@ -5,8 +5,8 @@
 #include "net/third_party/quiche/src/http2/hpack/huffman/hpack_huffman_encoder.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_string_utils.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_arraysize.h"
 
 namespace http2 {
 namespace {
@@ -22,7 +22,7 @@
       Http2HexDecode("25a849e95bb8e8b4bf"),
       "custom-value",
   };
-  for (size_t i = 0; i != HTTP2_ARRAYSIZE(test_table); i += 2) {
+  for (size_t i = 0; i != QUICHE_ARRAYSIZE(test_table); i += 2) {
     const std::string& huffman_encoded(test_table[i]);
     const std::string& plain_string(test_table[i + 1]);
     EXPECT_EQ(ExactHuffmanSize(plain_string), huffman_encoded.size());
@@ -53,7 +53,7 @@
     "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1",
   };
   // clang-format on
-  for (size_t i = 0; i != HTTP2_ARRAYSIZE(test_table); i += 2) {
+  for (size_t i = 0; i != QUICHE_ARRAYSIZE(test_table); i += 2) {
     const std::string& huffman_encoded(test_table[i]);
     const std::string& plain_string(test_table[i + 1]);
     EXPECT_EQ(ExactHuffmanSize(plain_string), huffman_encoded.size());
@@ -79,10 +79,10 @@
   };
   // Modify last |test_table| entry to cover all codes.
   for (size_t i = 0; i != 256; ++i) {
-    test_table[HTTP2_ARRAYSIZE(test_table) - 1][i] = static_cast<char>(i);
+    test_table[QUICHE_ARRAYSIZE(test_table) - 1][i] = static_cast<char>(i);
   }
 
-  for (size_t i = 0; i != HTTP2_ARRAYSIZE(test_table); ++i) {
+  for (size_t i = 0; i != QUICHE_ARRAYSIZE(test_table); ++i) {
     const std::string& plain_string = test_table[i];
     std::string huffman_encoded;
     HuffmanEncode(plain_string, &huffman_encoded);