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

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 52c0759e95057414ff85178fa1424749f2ed34a5..5e27e668e0b8becd6640c6732f2069cb549dc449 100644
--- a/net/quic/test_tools/crypto_test_utils_test.cc
+++ b/net/quic/test_tools/crypto_test_utils_test.cc
@@ -32,15 +32,14 @@ class ShloVerifier : public ValidateClientHelloResultCallback {
         compressed_certs_cache_(compressed_certs_cache) {}
 
   // Verify that the output message is a SHLO.
-  void RunImpl(const CryptoHandshakeMessage& chlo,
-               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 out;
     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,
@@ -119,8 +118,9 @@ TEST(CryptoTestUtilsTest, TestGenerateFullCHLO) {
   // Verify that full_chlo can pass crypto_config's verification.
   crypto_config.ValidateClientHello(
       full_chlo, client_addr.address(), server_ip, version, &clock, &proof,
-      new ShloVerifier(&crypto_config, server_ip, client_addr, &clock, &proof,
-                       &compressed_certs_cache));
+      std::unique_ptr<ShloVerifier>(
+          new ShloVerifier(&crypto_config, server_ip, client_addr, &clock,
+                           &proof, &compressed_certs_cache)));
 }
 
 }  // namespace test