Landing Recent QUIC changes until 7/26/2016 13:53 UTC

net/quic/test_tools/crypto_test_utils_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/test_tools/crypto_test_utils.h"
 
 #include "net/quic/crypto/crypto_server_config_protobuf.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "net/test/gtest_util.h"
@@ skipping 14 matching lines @@
                QuicCryptoProof* proof,
                QuicCompressedCertsCache* compressed_certs_cache)
       : crypto_config_(crypto_config),
         server_ip_(server_ip),
         client_addr_(client_addr),
         clock_(clock),
         proof_(proof),
         compressed_certs_cache_(compressed_certs_cache) {}
 
   // Verify that the output message is a SHLO.
-  void RunImpl(
-      const CryptoHandshakeMessage& chlo,
-      const ValidateClientHelloResultCallback::Result& result) override {
+  void RunImpl(const CryptoHandshakeMessage& chlo,
+               const 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_,
         client_addr_, QuicSupportedVersions().front(), QuicSupportedVersions(),
         /*use_stateless_rejects=*/true, /*server_designated_connection_id=*/0,
         clock_, QuicRandom::GetInstance(), compressed_certs_cache_, &params,
         proof_, &out, &diversification_nonce, &error_details);
@@ skipping 69 matching lines @@
                                     &compressed_certs_cache, &full_chlo);
   // 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));
 }
 
 }  // namespace test
 }  // namespace net