commit 4e9283db34507179aabf21c036970fd0b0cf9cc5
author bnc <bnc@google.com> Tue Dec 17 07:08:57 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Dec 17 07:09:33 2019 -0800
tree fb342c51eb8450cccbd6efa6d83ba3e63c6298c5
parent f0ff493bb2ae7019ff1536bd250f086ab0117fda

Remove QUIC_ARRAYSIZE; use QUICHE_ARRAYSIZE instead.

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

quic/core/quic_version_manager.cc

diff --git a/quic/core/quic_version_manager.cc b/quic/core/quic_version_manager.cc
index 0f21f01..8b25ecc 100644
--- a/quic/core/quic_version_manager.cc
+++ b/quic/core/quic_version_manager.cc
@@ -4,12 +4,12 @@
 
 #include "net/third_party/quiche/src/quic/core/quic_version_manager.h"
 
+#include <algorithm>
+
 #include "net/third_party/quiche/src/quic/core/quic_versions.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_arraysize.h"
 #include "net/third_party/quiche/src/quic/platform/api/quic_flag_utils.h"
 #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h"
-
-#include <algorithm>
+#include "net/third_party/quiche/src/common/platform/api/quiche_arraysize.h"
 
 namespace quic {
 
@@ -24,7 +24,7 @@
       disable_version_q046_(GetQuicReloadableFlag(quic_disable_version_q046)),
       disable_version_q043_(GetQuicReloadableFlag(quic_disable_version_q043)),
       allowed_supported_versions_(std::move(supported_versions)) {
-  static_assert(QUIC_ARRAYSIZE(kSupportedTransportVersions) == 6u,
+  static_assert(QUICHE_ARRAYSIZE(kSupportedTransportVersions) == 6u,
                 "Supported versions out of sync");
   RefilterSupportedVersions();
 }
@@ -43,7 +43,7 @@
 }
 
 void QuicVersionManager::MaybeRefilterSupportedVersions() {
-  static_assert(QUIC_ARRAYSIZE(kSupportedTransportVersions) == 6u,
+  static_assert(QUICHE_ARRAYSIZE(kSupportedTransportVersions) == 6u,
                 "Supported versions out of sync");
   if (enable_version_q099_ != GetQuicReloadableFlag(quic_enable_version_q099) ||
       enable_version_t099_ != GetQuicReloadableFlag(quic_enable_version_t099) ||