Landing Recent QUIC changes until Sat Oct 29 14:59:35.

net/quic/core/quic_crypto_server_stream_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/core/quic_crypto_server_stream.h"
 
 #include <map>
 #include <memory>
 #include <vector>
 
@@ skipping 96 matching lines @@
         server_id_, QuicTime::Delta::FromSeconds(100000), supported_versions_,
         helpers_.back().get(), alarm_factories_.back().get(),
         &server_crypto_config_, &server_compressed_certs_cache_,
         &server_connection_, &server_session);
     CHECK(server_session);
     server_session_.reset(server_session);
     CryptoTestUtils::FakeServerOptions options;
     options.token_binding_params = QuicTagVector{kTB10};
     CryptoTestUtils::SetupCryptoServerConfigForTest(
         server_connection_->clock(), server_connection_->random_generator(),
-        server_session_->config(), &server_crypto_config_, options);
+        &server_crypto_config_, options);
   }
 
   QuicCryptoServerStream* server_stream() {
     return server_session_->GetCryptoStream();
   }
 
   QuicCryptoClientStream* client_stream() {
     return client_session_->GetCryptoStream();
   }
 
@@ skipping 448 matching lines @@
   strike_register_client_->RunPendingVerifications();
 }
 
 class FailingProofSource : public ProofSource {
  public:
   bool GetProof(const IPAddress& server_ip,
                 const string& hostname,
                 const string& server_config,
                 QuicVersion quic_version,
                 StringPiece chlo_hash,
+                const QuicTagVector& connection_options,
                 scoped_refptr<ProofSource::Chain>* out_chain,
                 string* out_signature,
                 string* out_leaf_cert_sct) override {
     return false;
   }
 
   void GetProof(const IPAddress& server_ip,
                 const string& hostname,
                 const string& server_config,
                 QuicVersion quic_version,
                 StringPiece chlo_hash,
+                const QuicTagVector& connection_options,
                 std::unique_ptr<Callback> callback) override {
     callback->Run(false, nullptr, "", "", nullptr);
   }
 };
 
 class QuicCryptoServerStreamTestWithFailingProofSource
     : public QuicCryptoServerStreamTest {
  public:
   QuicCryptoServerStreamTestWithFailingProofSource()
       : QuicCryptoServerStreamTest(
@@ skipping 11 matching lines @@
   // Regression test for b/31521252, in which a crash would happen here.
   AdvanceHandshakeWithFakeClient();
   EXPECT_FALSE(server_stream()->encryption_established());
   EXPECT_FALSE(server_stream()->handshake_confirmed());
 }
 
 }  // namespace
 
 }  // namespace test
 }  // namespace net