Land Recent QUIC changes.

net/quic/test_tools/crypto_test_utils.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/test_tools/crypto_test_utils.h"
 
 #include "net/quic/crypto/common_cert_set.h"
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/crypto/crypto_server_config.h"
 #include "net/quic/crypto/quic_decrypter.h"
@@ skipping 426 matching lines @@
                                                      va_list ap) {
   CryptoHandshakeMessage msg;
   msg.set_tag(ParseTag(message_tag));
 
   for (;;) {
     const char* tagstr = va_arg(ap, const char*);
     if (tagstr == NULL) {
       break;
     }
 
+    if (tagstr[0] == '$') {
+      // Special value.
+      const char* const special = tagstr + 1;
+      if (strcmp(special, "padding") == 0) {
+        const int min_bytes = va_arg(ap, int);
+        msg.set_minimum_size(min_bytes);
+      } else {
+        CHECK(false) << "Unknown special value: " << special;
+      }
+
+      continue;
+    }
+
     const QuicTag tag = ParseTag(tagstr);
     const char* valuestr = va_arg(ap, const char*);
 
     size_t len = strlen(valuestr);
     if (len > 0 && valuestr[0] == '#') {
       valuestr++;
       len--;
 
       CHECK(len % 2 == 0);
       scoped_ptr<uint8[]> buf(new uint8[len/2]);
 
       for (size_t i = 0; i < len/2; i++) {
         uint8 v = 0;
         CHECK(HexChar(valuestr[i*2], &v));
         buf[i] = v << 4;
         CHECK(HexChar(valuestr[i*2 + 1], &v));
         buf[i] |= v;
       }
 
       msg.SetStringPiece(
           tag, StringPiece(reinterpret_cast<char*>(buf.get()), len/2));
       continue;
     }
 
     msg.SetStringPiece(tag, valuestr);
   }
 
-  return msg;
+  // The CryptoHandshakeMessage needs to be serialized and parsed to ensure
+  // that any padding is included.
+  scoped_ptr<QuicData> bytes(CryptoFramer::ConstructHandshakeMessage(msg));
+  scoped_ptr<CryptoHandshakeMessage> parsed(
+      CryptoFramer::ParseMessage(bytes->AsStringPiece()));
+  CHECK(parsed.get());
+
+  return *parsed;
 }
 
 }  // namespace test
 }  // namespace net