Land Recent QUIC changes

net/quic/test_tools/crypto_test_utils.h

Index: net/quic/test_tools/crypto_test_utils.h
diff --git a/net/quic/test_tools/crypto_test_utils.h b/net/quic/test_tools/crypto_test_utils.h
index b4a672e12c05be135a4166512447d9ba0a6739a7..62d813acad3e310085769e4bb44ddb6736df76e4 100644
--- a/net/quic/test_tools/crypto_test_utils.h
+++ b/net/quic/test_tools/crypto_test_utils.h
@@ -8,12 +8,14 @@
 #include <vector>
 
 #include "base/logging.h"
+#include "base/strings/string_piece.h"
 #include "net/quic/crypto/crypto_framer.h"
 #include "net/quic/quic_framer.h"
 #include "net/quic/quic_protocol.h"
 
 namespace net {
 
+class CommonCertSet;
 class ProofSource;
 class ProofVerifier;
 class QuicClock;
@@ -63,6 +65,12 @@ class CryptoTestUtils {
   // Returns a |ProofVerifier| that uses the QUIC testing root CA.
   static ProofVerifier* ProofVerifierForTesting();
 
+  // MockCommonCertSet returns a CommonCertSet that contains a single set with
+  // hash |hash|, consisting of the certificate |cert| at index |index|.
+  static CommonCertSet* MockCommonCertSet(base::StringPiece cert,
+                                          uint64 hash,
+                                          uint32 index);
+
  private:
   static void CompareClientAndServerKeys(QuicCryptoClientStream* client,
                                          QuicCryptoServerStream* server);