Replace va_arg version of crypto_test_utils::Message with a more modern vector argument version.

net/quic/test_tools/crypto_test_utils.h

 // 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.
 
 #ifndef NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_
 #define NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_
 
 #include <cstdarg>
 #include <cstddef>
 #include <cstdint>
@@ skipping 157 matching lines @@
 // Creates a minimal dummy reject message that will pass the client-config
 // validation tests. This will include a server config, but no certs, proof
 // source address token, or server nonce.
 void FillInDummyReject(CryptoHandshakeMessage* rej, bool reject_is_stateless);
 
 // ParseTag returns a QuicTag from parsing |tagstr|. |tagstr| may either be
 // in the format "EXMP" (i.e. ASCII format), or "#11223344" (an explicit hex
 // format). It CHECK fails if there's a parse error.
 QuicTag ParseTag(const char* tagstr);
 
-// Message constructs a handshake message from a variable number of
-// arguments. |message_tag| is passed to |ParseTag| and used as the tag of
-// the resulting message. The arguments are taken in pairs and nullptr
-// terminated. The first of each pair is the tag of a tag/value and is given
-// as an argument to |ParseTag|. The second is the value of the tag/value
-// pair and is either a hex dump, preceeded by a '#', or a raw value.
+// Message constructs a CHLO message from a provided vector of tag/value pairs.
+// The first of each pair is the tag of a tag/value and is given as an argument
+// to |ParseTag|. The second is the value of the tag/value pair and is either a
+// hex dump, preceeded by a '#', or a raw value. If minimum_size_bytes is
+// provided then the message will be padded to this minimum size.
 //
-//   Message(
-//       "CHLO",
-//       "NOCE", "#11223344",
-//       "SNI", "www.example.com",
-//       nullptr);
-CryptoHandshakeMessage Message(const char* message_tag, ...);
+//   CreateCHLO(
+//       {{"NOCE", "#11223344"},
+//        {"SNI", "www.example.com"}},
+//       optional_minimum_size_bytes);
+CryptoHandshakeMessage CreateCHLO(
+    std::vector<std::pair<std::string, std::string>> tags_and_values);
+CryptoHandshakeMessage CreateCHLO(
+    std::vector<std::pair<std::string, std::string>> tags_and_values,
+    int minimum_size_bytes);
 
 // ChannelIDSourceForTesting returns a ChannelIDSource that generates keys
 // deterministically based on the hostname given in the GetChannelIDKey call.
 // This ChannelIDSource works in synchronous mode, i.e., its GetChannelIDKey
 // method never returns QUIC_PENDING.
 ChannelIDSource* ChannelIDSourceForTesting();
 
 // MovePackets parses crypto handshake messages from packet number
 // |*inout_packet_index| through to the last packet (or until a packet fails
 // to decrypt) and has |dest_stream| process them. |*inout_packet_index| is
@@ skipping 33 matching lines @@
 // Return a CHLO PUBS in hexadecimal.
 std::string GenerateClientPublicValuesHex();
 
 }  // namespace crypto_test_utils
 
 }  // namespace test
 
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_