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 62d813acad3e310085769e4bb44ddb6736df76e4..62748a384bf9121e2e9f5eae3807c00ba8ad4977 100644
--- a/net/quic/test_tools/crypto_test_utils.h
+++ b/net/quic/test_tools/crypto_test_utils.h
@@ -15,7 +15,7 @@
 
 namespace net {
 
-class CommonCertSet;
+class CommonCertSets;
 class ProofSource;
 class ProofVerifier;
 class QuicClock;
@@ -57,7 +57,7 @@ class CryptoTestUtils {
 
   // Returns the value for the tag |tag| in the tag value map of |message|.
   static std::string GetValueForTag(const CryptoHandshakeMessage& message,
-                                    CryptoTag tag);
+                                    QuicTag tag);
 
   // Returns a |ProofSource| that serves up test certificates.
   static ProofSource* ProofSourceForTesting();
@@ -65,11 +65,11 @@ 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
+  // MockCommonCertSets returns a CommonCertSets 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);
+  static CommonCertSets* MockCommonCertSets(base::StringPiece cert,
+                                            uint64 hash,
+                                            uint32 index);
 
  private:
   static void CompareClientAndServerKeys(QuicCryptoClientStream* client,