Landing Recent QUIC changes until Mon Nov 14 04:43:50 2016 +0000

net/quic/test_tools/crypto_test_utils_test.cc

Index: net/quic/test_tools/crypto_test_utils_test.cc
diff --git a/net/quic/test_tools/crypto_test_utils_test.cc b/net/quic/test_tools/crypto_test_utils_test.cc
index d79b4601a8ff2e4c648206d835754f08d4c164df..667f09ef5701e2fe7a99d87dfb793b1422d4ced5 100644
--- a/net/quic/test_tools/crypto_test_utils_test.cc
+++ b/net/quic/test_tools/crypto_test_utils_test.cc
@@ -22,13 +22,13 @@ class ShloVerifier {
                IPAddress server_ip,
                IPEndPoint client_addr,
                const QuicClock* clock,
-               scoped_refptr<QuicCryptoProof> proof,
+               scoped_refptr<QuicSignedServerConfig> signed_config,
                QuicCompressedCertsCache* compressed_certs_cache)
       : crypto_config_(crypto_config),
         server_ip_(server_ip),
         client_addr_(client_addr),
         clock_(clock),
-        proof_(proof),
+        signed_config_(signed_config),
         compressed_certs_cache_(compressed_certs_cache),
         params_(new QuicCryptoNegotiatedParameters) {}
 
@@ -60,7 +60,7 @@ class ShloVerifier {
         client_addr_, AllSupportedVersions().front(), AllSupportedVersions(),
         /*use_stateless_rejects=*/true, /*server_designated_connection_id=*/0,
         clock_, QuicRandom::GetInstance(), compressed_certs_cache_, params_,
-        proof_, /*total_framing_overhead=*/50, kDefaultMaxPacketSize,
+        signed_config_, /*total_framing_overhead=*/50, kDefaultMaxPacketSize,
         GetProcessClientHelloCallback());
   }
 
@@ -96,7 +96,7 @@ class ShloVerifier {
   IPAddress server_ip_;
   IPEndPoint client_addr_;
   const QuicClock* clock_;
-  scoped_refptr<QuicCryptoProof> proof_;
+  scoped_refptr<QuicSignedServerConfig> signed_config_;
   QuicCompressedCertsCache* compressed_certs_cache_;
 
   scoped_refptr<QuicCryptoNegotiatedParameters> params_;
@@ -110,7 +110,8 @@ TEST(CryptoTestUtilsTest, TestGenerateFullCHLO) {
       CryptoTestUtils::ProofSourceForTesting());
   IPAddress server_ip;
   IPEndPoint client_addr(IPAddress::IPv4Localhost(), 1);
-  scoped_refptr<QuicCryptoProof> proof(new QuicCryptoProof);
+  scoped_refptr<QuicSignedServerConfig> signed_config(
+      new QuicSignedServerConfig);
   QuicCompressedCertsCache compressed_certs_cache(
       QuicCompressedCertsCache::kQuicCompressedCertsCacheSize);
   CryptoHandshakeMessage full_chlo;
@@ -151,20 +152,20 @@ TEST(CryptoTestUtilsTest, TestGenerateFullCHLO) {
     "COPT", "SREJ",
     "PUBS", pub_hex.c_str(),
     "NONC", nonce_hex.c_str(),
-    "VER\0", QuicUtils::TagToString(QuicVersionToQuicTag(version)).c_str(),
+    "VER\0", QuicTagToString(QuicVersionToQuicTag(version)).c_str(),
     "$padding", static_cast<int>(kClientHelloMinimumSize),
     nullptr);
   // clang-format on
 
   CryptoTestUtils::GenerateFullCHLO(inchoate_chlo, &crypto_config, server_ip,
-                                    client_addr, version, &clock, proof,
+                                    client_addr, version, &clock, signed_config,
                                     &compressed_certs_cache, &full_chlo);
   // Verify that full_chlo can pass crypto_config's verification.
   ShloVerifier shlo_verifier(&crypto_config, server_ip, client_addr, &clock,
-                             proof, &compressed_certs_cache);
+                             signed_config, &compressed_certs_cache);
   crypto_config.ValidateClientHello(
-      full_chlo, client_addr.address(), server_ip, version, &clock, proof,
-      shlo_verifier.GetValidateClientHelloCallback());
+      full_chlo, client_addr.address(), server_ip, version, &clock,
+      signed_config, shlo_verifier.GetValidateClientHelloCallback());
 }
 
 }  // namespace test