Change CryptoHandshakeMessage::GetTaglist to tag a QuicTagVector*

net/quic/core/quic_crypto_client_stream.cc

 // Copyright (c) 2012 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.
 
 #include "net/quic/core/quic_crypto_client_stream.h"
 
 #include <memory>
 
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
@@ skipping 373 matching lines @@
   // perform a handshake, or we sent a full hello that the server
   // rejected. Here we hope to have a REJ that contains the information
   // that we need.
   if ((in->tag() != kREJ) && (in->tag() != kSREJ)) {
     next_state_ = STATE_NONE;
     CloseConnectionWithDetails(QUIC_INVALID_CRYPTO_MESSAGE_TYPE,
                                "Expected REJ");
     return;
   }
 
-  const uint32_t* reject_reasons;
-  size_t num_reject_reasons;
+  QuicTagVector reject_reasons;
   static_assert(sizeof(QuicTag) == sizeof(uint32_t), "header out of sync");
-  if (in->GetTaglist(kRREJ, &reject_reasons, &num_reject_reasons) ==
-      QUIC_NO_ERROR) {
+  if (in->GetTaglist(kRREJ, &reject_reasons) == QUIC_NO_ERROR) {
     uint32_t packed_error = 0;
-    for (size_t i = 0; i < num_reject_reasons; ++i) {
+    for (size_t i = 0; i < reject_reasons.size(); ++i) {
       // HANDSHAKE_OK is 0 and don't report that as error.
       if (reject_reasons[i] == HANDSHAKE_OK || reject_reasons[i] >= 32) {
         continue;
       }
       HandshakeFailureReason reason =
           static_cast<HandshakeFailureReason>(reject_reasons[i]);
       packed_error |= 1 << (reason - 1);
     }
     DVLOG(1) << "Reasons for rejection: " << packed_error;
     if (num_client_hellos_ == kMaxClientHellos) {
@@ skipping 245 matching lines @@
 bool QuicCryptoClientStream::RequiresChannelID(
     QuicCryptoClientConfig::CachedState* cached) {
   if (server_id_.privacy_mode() == PRIVACY_MODE_ENABLED ||
       !crypto_config_->channel_id_source()) {
     return false;
   }
   const CryptoHandshakeMessage* scfg = cached->GetServerConfig();
   if (!scfg) {  // scfg may be null then we send an inchoate CHLO.
     return false;
   }
-  const QuicTag* their_proof_demands;
-  size_t num_their_proof_demands;
-  if (scfg->GetTaglist(kPDMD, &their_proof_demands, &num_their_proof_demands) !=
-      QUIC_NO_ERROR) {
+  QuicTagVector their_proof_demands;
+  if (scfg->GetTaglist(kPDMD, &their_proof_demands) != QUIC_NO_ERROR) {
     return false;
   }
-  for (size_t i = 0; i < num_their_proof_demands; i++) {
-    if (their_proof_demands[i] == kCHID) {
+  for (const QuicTag tag : their_proof_demands) {
+    if (tag == kCHID) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace net