Landing recent QUIC changes until 6/24/2016 14:00 UTC

net/quic/test_tools/crypto_test_utils.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 <openssl/bn.h>
 #include <openssl/ec.h>
 #include <openssl/ecdsa.h>
 #include <openssl/evp.h>
@@ skipping 253 matching lines @@
 CryptoTestUtils::FakeServerOptions::FakeServerOptions()
     : token_binding_enabled(false) {}
 
 CryptoTestUtils::FakeClientOptions::FakeClientOptions()
     : channel_id_enabled(false),
       channel_id_source_async(false),
       token_binding_enabled(false) {}
 
 // static
 int CryptoTestUtils::HandshakeWithFakeServer(
+    QuicConfig* server_quic_config,
     MockQuicConnectionHelper* helper,
     MockAlarmFactory* alarm_factory,
     PacketSavingConnection* client_conn,
     QuicCryptoClientStream* client,
     const FakeServerOptions& options) {
   PacketSavingConnection* server_conn =
       new PacketSavingConnection(helper, alarm_factory, Perspective::IS_SERVER,
                                  client_conn->supported_versions());
 
-  QuicConfig config = DefaultQuicConfig();
   QuicCryptoServerConfig crypto_config(QuicCryptoServerConfig::TESTING,
                                        QuicRandom::GetInstance(),
                                        ProofSourceForTesting());
   QuicCompressedCertsCache compressed_certs_cache(
       QuicCompressedCertsCache::kQuicCompressedCertsCacheSize);
   SetupCryptoServerConfigForTest(server_conn->clock(),
-                                 server_conn->random_generator(), &config,
-                                 &crypto_config, options);
+                                 server_conn->random_generator(),
+                                 server_quic_config, &crypto_config, options);
 
-  TestQuicSpdyServerSession server_session(server_conn, config, &crypto_config,
+  TestQuicSpdyServerSession server_session(server_conn, *server_quic_config,
+                                           &crypto_config,
                                            &compressed_certs_cache);
 
   // The client's handshake must have been started already.
   CHECK_NE(0u, client_conn->encrypted_packets_.size());
 
   CommunicateHandshakeMessages(client_conn, client, server_conn,
                                server_session.GetCryptoStream());
   CompareClientAndServerKeys(client, server_session.GetCryptoStream());
 
   return client->num_sent_client_hellos();
@@ skipping 517 matching lines @@
 
   ASSERT_EQ(0u, crypto_framer.InputBytesRemaining());
 
   for (const CryptoHandshakeMessage& message : crypto_visitor.messages()) {
     dest_stream->OnHandshakeMessage(message);
   }
 }
 
 }  // namespace test
 }  // namespace net