Add QUIC 31 in which the server's proof covers both the static server config as well as a hash of t…

net/quic/crypto/proof_verifier_chromium_test.cc

Index: net/quic/crypto/proof_verifier_chromium_test.cc
diff --git a/net/quic/crypto/proof_verifier_chromium_test.cc b/net/quic/crypto/proof_verifier_chromium_test.cc
index 19ccdef85e0f75294aae885a1b379f9b3d20d52b..b2fbba99b4bee50fcfa7e93ed5b73ce8bd78523b 100644
--- a/net/quic/crypto/proof_verifier_chromium_test.cc
+++ b/net/quic/crypto/proof_verifier_chromium_test.cc
@@ -222,8 +222,9 @@ TEST_F(ProofVerifierChromiumTest, FailsIfCertFails) {
   scoped_ptr<DummyProofVerifierCallback> callback(
       new DummyProofVerifierCallback);
   QuicAsyncStatus status = proof_verifier.VerifyProof(
-      kTestHostname, kTestConfig, certs_, "", GetTestSignature(),
-      verify_context_.get(), &error_details_, &details_, callback.get());
+      kTestHostname, kTestConfig, QUIC_VERSION_25, "", certs_, "",
+      GetTestSignature(), verify_context_.get(), &error_details_, &details_,
+      callback.get());
   ASSERT_EQ(QUIC_FAILURE, status);
 }
 
@@ -239,8 +240,9 @@ TEST_F(ProofVerifierChromiumTest, ValidSCTList) {
   scoped_ptr<DummyProofVerifierCallback> callback(
       new DummyProofVerifierCallback);
   QuicAsyncStatus status = proof_verifier.VerifyProof(
-      kTestHostname, kTestConfig, certs_, ct::GetSCTListForTesting(), "",
-      verify_context_.get(), &error_details_, &details_, callback.get());
+      kTestHostname, kTestConfig, QUIC_VERSION_25, "", certs_,
+      ct::GetSCTListForTesting(), "", verify_context_.get(), &error_details_,
+      &details_, callback.get());
   ASSERT_EQ(QUIC_FAILURE, status);
   CheckSCT(/*sct_expected_ok=*/true);
 }
@@ -257,8 +259,9 @@ TEST_F(ProofVerifierChromiumTest, InvalidSCTList) {
   scoped_ptr<DummyProofVerifierCallback> callback(
       new DummyProofVerifierCallback);
   QuicAsyncStatus status = proof_verifier.VerifyProof(
-      kTestHostname, kTestConfig, certs_, ct::GetSCTListWithInvalidSCT(), "",
-      verify_context_.get(), &error_details_, &details_, callback.get());
+      kTestHostname, kTestConfig, QUIC_VERSION_25, "", certs_,
+      ct::GetSCTListWithInvalidSCT(), "", verify_context_.get(),
+      &error_details_, &details_, callback.get());
   ASSERT_EQ(QUIC_FAILURE, status);
   CheckSCT(/*sct_expected_ok=*/false);
 }
@@ -273,7 +276,7 @@ TEST_F(ProofVerifierChromiumTest, FailsIfSignatureFails) {
   scoped_ptr<DummyProofVerifierCallback> callback(
       new DummyProofVerifierCallback);
   QuicAsyncStatus status = proof_verifier.VerifyProof(
-      kTestHostname, kTestConfig, certs_, "", kTestConfig,
+      kTestHostname, kTestConfig, QUIC_VERSION_25, "", certs_, "", kTestConfig,
       verify_context_.get(), &error_details_, &details_, callback.get());
   ASSERT_EQ(QUIC_FAILURE, status);
 }
@@ -297,8 +300,9 @@ TEST_F(ProofVerifierChromiumTest, PreservesEVIfNoPolicy) {
   scoped_ptr<DummyProofVerifierCallback> callback(
       new DummyProofVerifierCallback);
   QuicAsyncStatus status = proof_verifier.VerifyProof(
-      kTestHostname, kTestConfig, certs_, "", GetTestSignature(),
-      verify_context_.get(), &error_details_, &details_, callback.get());
+      kTestHostname, kTestConfig, QUIC_VERSION_25, "", certs_, "",
+      GetTestSignature(), verify_context_.get(), &error_details_, &details_,
+      callback.get());
   ASSERT_EQ(QUIC_SUCCESS, status);
 
   ASSERT_TRUE(details_.get());
@@ -329,8 +333,9 @@ TEST_F(ProofVerifierChromiumTest, PreservesEVIfAllowed) {
   scoped_ptr<DummyProofVerifierCallback> callback(
       new DummyProofVerifierCallback);
   QuicAsyncStatus status = proof_verifier.VerifyProof(
-      kTestHostname, kTestConfig, certs_, "", GetTestSignature(),
-      verify_context_.get(), &error_details_, &details_, callback.get());
+      kTestHostname, kTestConfig, QUIC_VERSION_25, "", certs_, "",
+      GetTestSignature(), verify_context_.get(), &error_details_, &details_,
+      callback.get());
   ASSERT_EQ(QUIC_SUCCESS, status);
 
   ASSERT_TRUE(details_.get());
@@ -361,8 +366,9 @@ TEST_F(ProofVerifierChromiumTest, StripsEVIfNotAllowed) {
   scoped_ptr<DummyProofVerifierCallback> callback(
       new DummyProofVerifierCallback);
   QuicAsyncStatus status = proof_verifier.VerifyProof(
-      kTestHostname, kTestConfig, certs_, "", GetTestSignature(),
-      verify_context_.get(), &error_details_, &details_, callback.get());
+      kTestHostname, kTestConfig, QUIC_VERSION_25, "", certs_, "",
+      GetTestSignature(), verify_context_.get(), &error_details_, &details_,
+      callback.get());
   ASSERT_EQ(QUIC_SUCCESS, status);
 
   ASSERT_TRUE(details_.get());
@@ -394,8 +400,9 @@ TEST_F(ProofVerifierChromiumTest, IgnoresPolicyEnforcerIfNotEV) {
   scoped_ptr<DummyProofVerifierCallback> callback(
       new DummyProofVerifierCallback);
   QuicAsyncStatus status = proof_verifier.VerifyProof(
-      kTestHostname, kTestConfig, certs_, "", GetTestSignature(),
-      verify_context_.get(), &error_details_, &details_, callback.get());
+      kTestHostname, kTestConfig, QUIC_VERSION_25, "", certs_, "",
+      GetTestSignature(), verify_context_.get(), &error_details_, &details_,
+      callback.get());
   ASSERT_EQ(QUIC_SUCCESS, status);
 
   ASSERT_TRUE(details_.get());