Landing Recent QUIC changes until Sat Sep 10 00:32:41

net/quic/test_tools/crypto_test_utils.cc

Index: net/quic/test_tools/crypto_test_utils.cc
diff --git a/net/quic/test_tools/crypto_test_utils.cc b/net/quic/test_tools/crypto_test_utils.cc
index f8e2f23683ca4f764df41c4e48ad81df2c15826f..d92e57d9fc61ad6149a94f2f7540f956b6596092 100644
--- a/net/quic/test_tools/crypto_test_utils.cc
+++ b/net/quic/test_tools/crypto_test_utils.cc
@@ -292,15 +292,14 @@ class FullChloGenerator : public ValidateClientHelloResultCallback {
         compressed_certs_cache_(compressed_certs_cache),
         out_(out) {}
 
-  void RunImpl(const CryptoHandshakeMessage& client_hello,
-               const ValidateClientHelloResultCallback::Result& result,
-               std::unique_ptr<ProofSource::Details> /* details */) override {
+  void Run(std::unique_ptr<ValidateClientHelloResultCallback::Result> result,
+           std::unique_ptr<ProofSource::Details> /* details */) override {
     QuicCryptoNegotiatedParameters params;
     string error_details;
     DiversificationNonce diversification_nonce;
     CryptoHandshakeMessage rej;
     crypto_config_->ProcessClientHello(
-        result, /*reject_only=*/false, /*connection_id=*/1, server_ip_,
+        *result, /*reject_only=*/false, /*connection_id=*/1, server_ip_,
         client_addr_, AllSupportedVersions().front(), AllSupportedVersions(),
         /*use_stateless_rejects=*/true, /*server_designated_connection_id=*/0,
         clock_, QuicRandom::GetInstance(), compressed_certs_cache_, &params,
@@ -322,7 +321,7 @@ class FullChloGenerator : public ValidateClientHelloResultCallback {
     StringPiece scid;
     ASSERT_TRUE(server_config->GetStringPiece(kSCID, &scid));
 
-    *out_ = client_hello;
+    *out_ = result->client_hello;
     out_->SetStringPiece(kSCID, scid);
     out_->SetStringPiece(kSourceAddressTokenTag, srct);
     uint64_t xlct = CryptoTestUtils::LeafCertHashForTesting();
@@ -967,8 +966,9 @@ void CryptoTestUtils::GenerateFullCHLO(
   // Pass a inchoate CHLO.
   crypto_config->ValidateClientHello(
       inchoate_chlo, client_addr.address(), server_ip, version, clock, proof,
-      new FullChloGenerator(crypto_config, server_ip, client_addr, clock, proof,
-                            compressed_certs_cache, out));
+      std::unique_ptr<FullChloGenerator>(
+          new FullChloGenerator(crypto_config, server_ip, client_addr, clock,
+                                proof, compressed_certs_cache, out)));
 }
 
 }  // namespace test