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

net/quic/test_tools/crypto_test_utils.h

 // 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.
 
 #ifndef NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_
 #define NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_
 
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 82 matching lines @@
                                      const FakeServerOptions& options);
 
   // returns: the number of client hellos that the client sent.
   static int HandshakeWithFakeClient(MockQuicConnectionHelper* helper,
                                      MockAlarmFactory* alarm_factory,
                                      PacketSavingConnection* server_conn,
                                      QuicCryptoServerStream* server,
                                      const QuicServerId& server_id,
                                      const FakeClientOptions& options);
 
-  // SetupCryptoServerConfigForTest configures |config| and |crypto_config|
+  // SetupCryptoServerConfigForTest configures |crypto_config|
   // with sensible defaults for testing.
   static void SetupCryptoServerConfigForTest(
       const QuicClock* clock,
       QuicRandom* rand,
-      QuicConfig* config,
       QuicCryptoServerConfig* crypto_config,
       const FakeServerOptions& options);
 
   // CommunicateHandshakeMessages moves messages from |client| to |server| and
   // back until |clients|'s handshake has completed.
   static void CommunicateHandshakeMessages(PacketSavingConnection* client_conn,
                                            QuicCryptoStream* client,
                                            PacketSavingConnection* server_conn,
                                            QuicCryptoStream* server);
 
@@ skipping 117 matching lines @@
   static std::string GenerateClientPublicValuesHex();
 
   DISALLOW_COPY_AND_ASSIGN(CryptoTestUtils);
 };
 
 }  // namespace test
 
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_